beaker 1.9.1 → 1.10.0

data/spec/beaker/hypervisor/blimper_spec.rb

@@ -38,40 +38,5 @@ module Beaker
       blimper.cleanup
     end
 
-    context "amiports" do
-
-      it "can set ports for database host" do
-        host = @hosts[0]
-        host[ :roles ] = [ "database" ]
-        
-        expect( blimper.amiports(host) ).to be === [ 22, 8080, 8081 ]
-
-      end
-
-      it "can set ports for master host" do
-        host = @hosts[0]
-        host[ :roles ] = [ "master" ]
-        
-        expect( blimper.amiports(host) ).to be === [ 22, 8140 ]
-
-      end
-
-      it "can set ports for dashboard host" do
-        host = @hosts[0]
-        host[ :roles ] = [ "dashboard" ]
-        
-        expect( blimper.amiports(host) ).to be === [ 22, 443 ]
-      end
-
-      it "can set ports for combined master/database/dashboard host" do
-        host = @hosts[0]
-        host[ :roles ] = [ "dashboard", "master", "database" ]
-        
-        expect( blimper.amiports(host) ).to be === [ 22, 8080, 8081, 8140, 443 ]
-      end
-    end
-
-
   end
-
 end

data/spec/beaker/hypervisor/ec2_helper_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'beaker/hypervisor/ec2_helper'
+
+describe Beaker::EC2Helper do
+  context ".amiports" do
+    let(:ec2) { Beaker::EC2Helper }
+    it "can set ports for database host" do
+      expect(ec2.amiports(["database"])).to be === [22, 8080, 8081]
+    end
+
+    it "can set ports for master host" do
+      expect(ec2.amiports(["master"])).to be === [22, 8140]
+    end
+
+    it "can set ports for dashboard host" do
+      expect(ec2.amiports(["dashboard"])).to be === [22, 443]
+    end
+
+    it "can set ports for combined master/database/dashboard host" do
+      expect(ec2.amiports(["dashboard", "master", "database"])).to be === [22, 8080, 8081, 8140, 443]
+    end
+  end
+end

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -18,7 +18,6 @@ module Beaker
 
     end
 
-
     it "can make a Vagranfile for a set of hosts" do
       FakeFS.activate!
       path = vagrant.instance_variable_get( :@vagrant_path )
@@ -29,6 +28,28 @@ module Beaker
       expect( File.read( File.expand_path( File.join( path, "Vagrantfile") ) ) ).to be === "Vagrant.configure(\"2\") do |c|\n  c.vm.define 'vm1' do |v|\n    v.vm.hostname = 'vm1'\n    v.vm.box = 'vm1_of_my_box'\n    v.vm.box_url = 'http://address.for.my.box.vm1'\n    v.vm.base_mac = '0123456789'\n    v.vm.network :private_network, ip: \"ip.address.for.vm1\", :netmask => \"255.255.0.0\"\n  end\n  c.vm.define 'vm2' do |v|\n    v.vm.hostname = 'vm2'\n    v.vm.box = 'vm2_of_my_box'\n    v.vm.box_url = 'http://address.for.my.box.vm2'\n    v.vm.base_mac = '0123456789'\n    v.vm.network :private_network, ip: \"ip.address.for.vm2\", :netmask => \"255.255.0.0\"\n  end\n  c.vm.define 'vm3' do |v|\n    v.vm.hostname = 'vm3'\n    v.vm.box = 'vm3_of_my_box'\n    v.vm.box_url = 'http://address.for.my.box.vm3'\n    v.vm.base_mac = '0123456789'\n    v.vm.network :private_network, ip: \"ip.address.for.vm3\", :netmask => \"255.255.0.0\"\n  end\n  c.vm.provider :virtualbox do |vb|\n    vb.customize [\"modifyvm\", :id, \"--memory\", \"1024\"]\n  end\nend\n"
     end
 
+    it "generates a valid windows config" do
+      FakeFS.activate!
+      path = vagrant.instance_variable_get( :@vagrant_path )
+      vagrant.stub( :randmac ).and_return( "0123456789" )
+      @hosts[0][:platform] = 'windows'
+
+      vagrant.make_vfile( @hosts )
+
+      generated_file = File.read( File.expand_path( File.join( path, "Vagrantfile") ) )
+
+      match = generated_file.match(/v.vm.network :forwarded_port, guest: 3389, host: 3389/)
+      expect( match ).to_not be_nil,'Should have proper port for RDP'
+
+      match = generated_file.match(/v.vm.network :forwarded_port, guest: 5985, host: 5985, id: 'winrm', auto_correct: true/)
+      expect( match ).to_not be_nil, "Should have proper port for WinRM"
+
+      match = generated_file.match(/v.vm.guest = :windows/)
+      expect( match ).to_not be_nil, 'Should correctly identify guest OS so Vagrant can act accordingly'
+
+
+    end
+
     it "uses the memsize defined per vagrant host" do
       FakeFS.activate!
       path = vagrant.instance_variable_get( :@vagrant_path )

data/spec/beaker/options/parser_spec.rb

@@ -132,8 +132,11 @@ module Beaker
 
       it "can correctly combine arguments from different sources" do
         FakeFS.deactivate!
+        build_url = ENV["BUILD_URL"]
+        ENV["BUILD_URL"] = "http://my.build.url/"
         args = ["-h", hosts_path, "--log-level", "debug", "--type", "git", "--install", "PUPPET/1.0,HIERA/hello"]
-        expect(parser.parse_args(args)).to be === {:project=>"Beaker", :department=>"#{ENV['USER']}", :log_level=>"debug", :trace_limit=>10, :hosts_file=>hosts_path, :options_file=>nil, :type=>"git", :provision=>true, :preserve_hosts=>'never', :root_keys=>false, :quiet=>false, :xml=>false, :color=>true, :dry_run=>false, :timeout=>300, :fail_mode=>'slow', :timesync=>false, :repo_proxy=>false, :add_el_extras=>false, :add_master_entry=>false, :consoleport=>443, :pe_dir=>"/opt/enterprise/dists", :pe_version_file=>"LATEST", :pe_version_file_win=>"LATEST-win", :dot_fog=>"#{home}/.fog", :help=>false, :ec2_yaml=>"config/image_templates/ec2.yaml", :ssh=>{:config=>false, :paranoid=>false, :timeout=>300, :auth_methods=>["publickey"], :port=>22, :forward_agent=>true, :keys=>["#{home}/.ssh/id_rsa"], :user_known_hosts_file=>"#{home}/.ssh/known_hosts"}, :install=>["git://github.com/puppetlabs/puppet.git#1.0", "git://github.com/puppetlabs/hiera.git#hello"], :HOSTS=>{:"pe-ubuntu-lucid"=>{:roles=>["agent", "dashboard", "database", "master"], :vmname=>"pe-ubuntu-lucid", :platform=>"ubuntu-10.04-i386", :snapshot=>"clean-w-keys", :hypervisor=>"fusion"}, :"pe-centos6"=>{:roles=>["agent"], :vmname=>"pe-centos6", :platform=>"el-6-i386", :hypervisor=>"fusion", :snapshot=>"clean-w-keys"}}, :nfs_server=>"none", :helper=>[], :load_path=>[], :tests=>[], :pre_suite=>[], :post_suite=>[], :modules=>[]}
+        expect(parser.parse_args(args)).to be === {:project=>"Beaker", :department=>"#{ENV['USER']}", :validate=>true, :jenkins_build_url=> "http://my.build.url/", :log_level=>"debug", :trace_limit=>10, :hosts_file=>hosts_path, :options_file=>nil, :type=>"git", :provision=>true, :preserve_hosts=>'never', :root_keys=>false, :quiet=>false, :xml=>false, :color=>true, :dry_run=>false, :timeout=>300, :fail_mode=>'slow', :timesync=>false, :repo_proxy=>false, :add_el_extras=>false, :add_master_entry=>false, :consoleport=>443, :pe_dir=>"/opt/enterprise/dists", :pe_version_file=>"LATEST", :pe_version_file_win=>"LATEST-win", :dot_fog=>"#{home}/.fog", :help=>false, :ec2_yaml=>"config/image_templates/ec2.yaml", :ssh=>{:config=>false, :paranoid=>false, :timeout=>300, :auth_methods=>["publickey"], :port=>22, :forward_agent=>true, :keys=>["#{home}/.ssh/id_rsa"], :user_known_hosts_file=>"#{home}/.ssh/known_hosts"}, :install=>["git://github.com/puppetlabs/puppet.git#1.0", "git://github.com/puppetlabs/hiera.git#hello"], :HOSTS=>{:"pe-ubuntu-lucid"=>{:roles=>["agent", "dashboard", "database", "master"], :vmname=>"pe-ubuntu-lucid", :platform=>"ubuntu-10.04-i386", :snapshot=>"clean-w-keys", :hypervisor=>"fusion"}, :"pe-centos6"=>{:roles=>["agent"], :vmname=>"pe-centos6", :platform=>"el-6-i386", :hypervisor=>"fusion", :snapshot=>"clean-w-keys"}}, :nfs_server=>"none", :helper=>[], :load_path=>[], :tests=>[], :pre_suite=>[], :post_suite=>[], :modules=>[]}
+        ENV["BUILD_URL"] = build_url
       end
 
       it "ensures that fail-mode is one of fast/slow" do

data/spec/beaker/test_case_spec.rb

@@ -1,6 +1,90 @@
 require 'spec_helper'
 
 module Beaker
-  describe TestCase do
+  describe TestCase, :use_fakefs => true do
+    let(:logger) {  double('logger').as_null_object }
+    let(:path) { @path || '/tmp/nope' }
+    let(:testcase) { TestCase.new({}, logger, {}, path) }
+
+    context 'run_test' do
+      it 'defaults to test_status :pass on success' do
+        path = 'test.rb'
+        File.open(path, 'w') do |f|
+          f.write ""
+        end
+        @path = path
+        testcase.should_not_receive( :log_and_fail_test )
+        testcase.run_test
+        status = testcase.instance_variable_get(:@test_status)
+        expect(status).to be === :pass
+      end
+
+      it 'updates test_status to :skip on SkipTest' do
+        path = 'test.rb'
+        File.open(path, 'w') do |f|
+          f.write "raise SkipTest"
+        end
+        @path = path
+        testcase.should_not_receive( :log_and_fail_test )
+        testcase.run_test
+        status = testcase.instance_variable_get(:@test_status)
+        expect(status).to be === :skip
+      end
+
+      it 'updates test_status to :pending on PendingTest' do
+        path = 'test.rb'
+        File.open(path, 'w') do |f|
+          f.write "raise PendingTest"
+        end
+        @path = path
+        testcase.should_not_receive( :log_and_fail_test )
+        testcase.run_test
+        status = testcase.instance_variable_get(:@test_status)
+        expect(status).to be === :pending
+      end
+
+      it 'updates test_status to :fail on FailTest' do
+        path = 'test.rb'
+        File.open(path, 'w') do |f|
+          f.write "raise FailTest"
+        end
+        @path = path
+        testcase.should_not_receive( :log_and_fail_test )
+        testcase.run_test
+        status = testcase.instance_variable_get(:@test_status)
+        expect(status).to be === :fail
+      end
+
+      it 'correctly handles RuntimeError' do
+        path = 'test.rb'
+        File.open(path, 'w') do |f|
+          f.write "raise RuntimeError"
+        end
+        @path = path
+        testcase.should_receive( :log_and_fail_test ).once.with(kind_of(RuntimeError))
+        testcase.run_test
+      end
+
+      it 'correctly handles ScriptError' do
+        path = 'test.rb'
+        File.open(path, 'w') do |f|
+          f.write "raise ScriptError"
+        end
+        @path = path
+        testcase.should_receive( :log_and_fail_test ).once.with(kind_of(ScriptError))
+        testcase.run_test
+      end
+
+      it 'correctly handles Timeout::Error' do
+        path = 'test.rb'
+        File.open(path, 'w') do |f|
+          f.write "raise Timeout::Error"
+        end
+        @path = path
+        testcase.should_receive( :log_and_fail_test ).once.with(kind_of(Timeout::Error))
+        testcase.run_test
+      end
+    end
+
   end
 end

data/spec/mocks.rb

@@ -65,6 +65,10 @@ class FakeHost
     @commands = []
   end
 
+  def port_open?(port)
+    true
+  end
+
   def is_pe?
     @pe
   end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +234,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.4
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.38'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.38'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -300,6 +328,7 @@ files:
 - lib/beaker/dsl/wrappers.rb
 - lib/beaker/host.rb
 - lib/beaker/host/aix.rb
+- lib/beaker/host/aix/exec.rb
 - lib/beaker/host/aix/file.rb
 - lib/beaker/host/aix/group.rb
 - lib/beaker/host/aix/user.rb
@@ -318,7 +347,9 @@ files:
 - lib/beaker/host_prebuilt_steps.rb
 - lib/beaker/hypervisor.rb
 - lib/beaker/hypervisor/aixer.rb
+- lib/beaker/hypervisor/aws_sdk.rb
 - lib/beaker/hypervisor/blimper.rb
+- lib/beaker/hypervisor/ec2_helper.rb
 - lib/beaker/hypervisor/fusion.rb
 - lib/beaker/hypervisor/google_compute.rb
 - lib/beaker/hypervisor/google_compute_helper.rb
@@ -363,7 +394,9 @@ files:
 - spec/beaker/host_prebuilt_steps_spec.rb
 - spec/beaker/host_spec.rb
 - spec/beaker/hypervisor/aixer_spec.rb
+- spec/beaker/hypervisor/aws_sdk_spec.rb
 - spec/beaker/hypervisor/blimper_spec.rb
+- spec/beaker/hypervisor/ec2_helper_spec.rb
 - spec/beaker/hypervisor/fusion_spec.rb
 - spec/beaker/hypervisor/google_compute.rb
 - spec/beaker/hypervisor/hypervisor_spec.rb
@@ -440,7 +473,9 @@ test_files:
 - spec/beaker/host_prebuilt_steps_spec.rb
 - spec/beaker/host_spec.rb
 - spec/beaker/hypervisor/aixer_spec.rb
+- spec/beaker/hypervisor/aws_sdk_spec.rb
 - spec/beaker/hypervisor/blimper_spec.rb
+- spec/beaker/hypervisor/ec2_helper_spec.rb
 - spec/beaker/hypervisor/fusion_spec.rb
 - spec/beaker/hypervisor/google_compute.rb
 - spec/beaker/hypervisor/hypervisor_spec.rb