beaker 2.15.1 → 2.16.0

data/spec/beaker/dsl/install_utils/foss_utils_spec.rb

@@ -602,7 +602,7 @@ describe ClassMixedWithDSLInstallUtils do
   end
 
   describe '#install_puppet_agent_from_msi_on' do
-    let( :opts )     { { :version => 'VERSION' } }
+    let( :opts )     { { :puppet_agent_version => 'VERSION' } }
     let( :platform ) { 'windows' }
     let( :host )     { { :platform => platform } }
 

data/spec/beaker/dsl/install_utils/pe_utils_spec.rb

@@ -453,8 +453,10 @@ describe ClassMixedWithDSLInstallUtils do
       expect( subject ).to receive( :create_remote_file ).with( hosts[0], /answers/, /q/ ).once
       #run installer on all hosts
       expect( subject ).to receive( :on ).with( hosts[0], /puppet-enterprise-installer/ ).once
-      expect( subject ).to receive( :install_puppet_agent_pe_promoted_repo_on ).with( hosts[1], opts ).once
-      expect( subject ).to receive( :install_puppet_agent_pe_promoted_repo_on ).with( hosts[2], opts ).once
+      expect( subject ).to receive( :install_puppet_agent_pe_promoted_repo_on ).with( hosts[1],
+                                                                                     {:puppet_agent_version=>nil, :puppet_agent_sha=>nil, :pe_ver=>nil, :puppet_collection=>nil} ).once
+      expect( subject ).to receive( :install_puppet_agent_pe_promoted_repo_on ).with( hosts[2],
+                                                                                     {:puppet_agent_version=>nil, :puppet_agent_sha=>nil, :pe_ver=>nil, :puppet_collection=>nil} ).once
       hosts.each do |host|
         expect( subject ).to receive( :add_aio_defaults_on ).with( host ).once
         expect( subject ).to receive( :sign_certificate_for ).with( host ).once

data/spec/beaker/host_spec.rb

@@ -584,6 +584,29 @@ module Beaker
       it 'throws an IOError when the file given doesn\'t exist' do
         expect { host.do_rsync_to "/does/not/exist", "does/not/exist/over/there", {} }.to raise_error(IOError)
       end
+
+      it 'uses the ssh config file' do
+        @options = {'ssh' => {:config => '/var/folders/v0/centos-64-x6420150625-48025-lu3u86'}}
+        create_files(['source'])
+        args = [ 'source', 'target',
+                 {:ignore => ['.bundle']} ]
+        # since were using fakefs we need to create the file and directories
+        FileUtils.mkdir_p('/var/folders/v0/')
+        FileUtils.touch('/var/folders/v0/centos-64-x6420150625-48025-lu3u86')
+        rsync_args = [ 'source', 'target', ['-az', "-e \"ssh -F /var/folders/v0/centos-64-x6420150625-48025-lu3u86 -o 'StrictHostKeyChecking no'\"", "--exclude '.bundle'"] ]
+        expect(Rsync).to receive(:run).with(*rsync_args).and_return(Beaker::Result.new(host, 'output!'))
+        expect(host.do_rsync_to(*args).cmd).to eq('output!')
+      end
+
+      it 'does not use the ssh config file when config does not exist' do
+        @options = {'ssh' => {:config => '/var/folders/v0/centos-64-x6420150625-48025-lu3u86'}}
+        create_files(['source'])
+        args = [ 'source', 'target',
+                 {:ignore => ['.bundle']} ]
+        rsync_args = [ 'source', 'target', ['-az', "-e \"ssh -o 'StrictHostKeyChecking no'\"", "--exclude '.bundle'"] ]
+        expect(Rsync).to receive(:run).with(*rsync_args).and_return(Beaker::Result.new(host, 'output!'))
+        expect(host.do_rsync_to(*args).cmd).to eq('output!')
+      end
     end
 
     it 'interpolates to its "name"' do

data/spec/beaker/hypervisor/aws_sdk_spec.rb

@@ -34,20 +34,52 @@ module Beaker
     }}
 
     before :each do
-      @hosts = make_hosts({:snapshot => :pe}, 4)
+      @hosts = make_hosts({:snapshot => :pe}, 5)
       @hosts[0][:platform] = "centos-5-x86-64-west"
       @hosts[1][:platform] = "centos-6-x86-64-west"
       @hosts[2][:platform] = "centos-7-x86-64-west"
       @hosts[3][:platform] = "ubuntu-12.04-amd64-west"
       @hosts[3][:user] = "ubuntu"
+      @hosts[4][:platform] = 'f5-host'
+      @hosts[4][:user] = 'notroot'
     end
 
-    context 'enabling root shall be called once for the ubuntu machine' do
-      it "should enable root once" do
+    context 'enabling root' do
+      it 'enables root once on the ubuntu host through the main code path' do
         expect( aws ).to receive(:copy_ssh_to_root).with( @hosts[3], options ).once()
         expect( aws ).to receive(:enable_root_login).with( @hosts[3], options).once()
         aws.enable_root_on_hosts();
       end
+
+      it 'enables root once on the f5 host through its code path' do
+        expect( aws ).to receive(:enable_root_f5).with( @hosts[4] ).once()
+        aws.enable_root_on_hosts()
+      end
+
+      describe '#enable_root_f5' do
+
+        it 'creates a password on the host' do
+          f5_host = @hosts[4]
+          result_mock = Beaker::Result.new(f5_host, '')
+          result_mock.exit_code = 0
+          allow( f5_host ).to receive( :exec ).and_return(result_mock)
+          allow( aws ).to receive( :backoff_sleep )
+          sha_mock = Object.new
+          allow( Digest::SHA256 ).to receive( :new ).and_return(sha_mock)
+          expect( sha_mock ).to receive( :hexdigest ).once()
+          aws.enable_root_f5(f5_host)
+        end
+
+        it 'tries 10x before failing correctly' do
+          f5_host = @hosts[4]
+          result_mock = Beaker::Result.new(f5_host, '')
+          result_mock.exit_code = 2
+          allow( f5_host ).to receive( :exec ).and_return(result_mock)
+          expect( aws ).to receive( :backoff_sleep ).exactly(9).times
+          expect{ aws.enable_root_f5(f5_host) }.to raise_error( RuntimeError, /unable/ )
+        end
+
+      end
     end
 
     context '#backoff_sleep' do

data/spec/beaker/options/command_line_parser_spec.rb

@@ -6,8 +6,8 @@ module Beaker
 
       let(:parser) {Beaker::Options::CommandLineParser.new}
       let(:test_opts) {["-h", "vcloud.cfg", "--debug", "--tests", "test.rb", "--help"]}
-      let(:full_opts_in)  {["--hosts", "host.cfg",           "--options", "opts_file", "--helper", "path_to_helper", "--load-path", "load_path", "--tests", "test1.rb,test2.rb,test3.rb", "--pre-suite", "pre_suite.rb", "--post-suite", "post_suite.rb", "--no-provision", "--preserve-hosts", "always",   "--root-keys", "--keyfile", "../.ssh/id_rsa", "--install", "gitrepopath",     "-m", "module",         "-q",    "--dry-run",       "--no-ntp",    "--repo-proxy",    "--add-el-extras", "--config", "anotherfile.cfg", "--fail-mode", "fast",  "--no-color",    "--version", "--log-level", "info", "--package-proxy", "http://192.168.100.1:3128",    "--collect-perf-data",    "--parse-only",    "--validate", "--timeout", "40", "--log-prefix", "pants",      "--configure",         "--tag", "1,2,3", "--exclude-tag", "4,5,6"]}
-      let(:full_opts_out) {{:hosts_file=>"anotherfile.cfg",:options_file=>"opts_file", :helper => "path_to_helper",  :load_path => "load_path",  :tests => "test1.rb,test2.rb,test3.rb",  :pre_suite => "pre_suite.rb",  :post_suite => "post_suite.rb", :provision=>false, :preserve_hosts => "always", :root_keys=>true, :keyfile => "../.ssh/id_rsa",  :install => "gitrepopath", :modules=>"module", :quiet=>true, :dry_run=>true, :timesync=>false, :repo_proxy=>true, :add_el_extras=>true,                                 :fail_mode => "fast", :color=>false, :version=>true,  :log_level => "info",  :package_proxy => "http://192.168.100.1:3128", :collect_perf_data=>true, :parse_only=>true, :validate=>true,  :timeout => "40",  :log_prefix => "pants", :configure => true, :tag_includes => "1,2,3", :tag_excludes => "4,5,6"}}
+      let(:full_opts_in)  {["--hosts", "host.cfg",           "--options", "opts_file", "--helper", "path_to_helper", "--load-path", "load_path", "--tests", "test1.rb,test2.rb,test3.rb", "--pre-suite", "pre_suite.rb", "--post-suite", "post_suite.rb", "--no-provision", "--preserve-hosts", "always",   "--root-keys", "--keyfile", "../.ssh/id_rsa", "--install", "gitrepopath",     "-m", "module",         "-q",    "--dry-run",       "--no-ntp",    "--repo-proxy",    "--add-el-extras", "--config", "anotherfile.cfg", "--fail-mode", "fast",  "--no-color",    "--version", "--log-level", "info", "--package-proxy", "http://192.168.100.1:3128",    "--collect-perf-data",    "--parse-only",    "--validate", "--timeout", "40", "--log-prefix", "pants",      "--configure",         "--tag", "1,2,3", "--exclude-tag", "4,5,6",        "--xml-time-order"]}
+      let(:full_opts_out) {{:hosts_file=>"anotherfile.cfg",:options_file=>"opts_file",  :helper => "path_to_helper",  :load_path => "load_path",  :tests => "test1.rb,test2.rb,test3.rb",  :pre_suite => "pre_suite.rb",  :post_suite => "post_suite.rb", :provision=>false, :preserve_hosts => "always", :root_keys=>true, :keyfile => "../.ssh/id_rsa",  :install => "gitrepopath", :modules=>"module", :quiet=>true, :dry_run=>true, :timesync=>false, :repo_proxy=>true, :add_el_extras=>true,                                 :fail_mode => "fast", :color=>false, :version=>true,  :log_level => "info",  :package_proxy => "http://192.168.100.1:3128", :collect_perf_data=>true, :parse_only=>true, :validate=>true,  :timeout => "40",  :log_prefix => "pants", :configure => true, :tag_includes => "1,2,3", :tag_excludes => "4,5,6", :xml_time_enabled => true}}
       let(:validate_true)  {["--validate"]}
       let(:validate_false) {["--no-validate"]}
       let(:configure_true)  {['--configure']}

data/spec/beaker/test_suite_spec.rb

@@ -226,6 +226,43 @@ module Beaker
         expect( test_suite_result.elapsed_time ).to be == 111
       end
 
+      describe '#write_junit_xml' do
+        let( :options )     { make_opts.merge({ :logger => double().as_null_object, 'name' => create_files(@files), :log_dated_dir => '.', :xml_dated_dir => '.'}) }
+        let(:rb_test)       { 'my_ruby_file.rb'     }
+
+        it 'doesn\'t re-order test cases themselves on time_sort' do
+          nokogiri_mock = Hash.new
+          allow( nokogiri_mock ).to receive( :add_child )
+          allow( Nokogiri::XML::Node ).to receive( :new ) { nokogiri_mock }
+          allow( LoggerJunit ).to receive( :write_xml ).and_yield( Object.new, nokogiri_mock )
+
+          @files = [ rb_test, rb_test, rb_test]
+          ts = Beaker::TestSuite.new( 'name', hosts, options, Time.now, :fast )
+          tsr = ts.instance_variable_get( :@test_suite_results )
+
+          allow( tsr ).to receive( :start_time ).and_return(0)
+          allow( tsr ).to receive( :stop_time ).and_return(10)
+          expect( tsr.instance_variable_get( :@logger ) ).to receive( :error ).never
+
+          test_cases = []
+          3.times do
+            tc = Beaker::TestCase.new( hosts, options[:logger], options, rb_test)
+            allow( tc ).to receive( :sublog ).and_return( false )
+            test_cases << tc
+          end
+          test_cases[0].instance_variable_set(:@runtime, 3)
+          test_cases[1].instance_variable_set(:@runtime, 301)
+          test_cases[2].instance_variable_set(:@runtime, 101)
+          test_cases.map { |tc| tsr.add_test_case( tc ) }
+
+          original_testcase_order = test_suite_result.instance_variable_get( :@test_cases ).dup
+          tsr.write_junit_xml( 'fakeFilePath07', 'fakeFileToLink09', true )
+          after_testcase_order = test_suite_result.instance_variable_get( :@test_cases ).dup
+          expect( after_testcase_order ).to be === original_testcase_order
+        end
+
+      end
+
 
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.15.1
+  version: 2.16.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -397,6 +397,7 @@ files:
 - acceptance/pre_suite/puppet_pkg/install.rb
 - acceptance/tests/base/README.md
 - acceptance/tests/base/host.rb
+- acceptance/tests/hypervisor/communication.rb
 - acceptance/tests/puppet/README.md
 - acceptance/tests/puppet/install_smoke.rb
 - beaker.gemspec