beaker 2.10.0 → 2.11.0

data/lib/beaker/shared/host_manager.rb

@@ -88,8 +88,17 @@ module Beaker
           end
         end
         if block_hosts.is_a? Array
-          result = block_hosts.map do |h|
-            run_block_on h, nil, &block
+          if block_hosts.length > 0
+            result = block_hosts.map do |h|
+              run_block_on h, nil, &block
+            end
+          else
+            # there are no matching hosts to execute against
+            # should warn here
+            # check if logger is defined in this context
+            if ( cur_logger = (logger || @logger ) )
+              cur_logger.warn "Attempting to execute against an empty array of hosts (#{hosts}, filtered to #{block_hosts}), no execution will occur"
+            end
           end
         else
           result = yield block_hosts

data/lib/beaker/ssh_connection.rb

@@ -78,6 +78,32 @@ module Beaker
       end
     end
 
+    #We expect the connection to close so wait for that to happen
+    def wait_for_connection_failure
+      try = 1
+      last_wait = 0
+      wait = 1
+      while try < 11
+        begin
+          @logger.debug "Waiting for connection failure on #{@hostname} (attempt #{try}, try again in #{wait} second(s))"
+          @ssh.open_channel do |channel|
+            channel.exec('') #Just send something down the pipe
+          end
+          loop_tries = 0
+          #loop is actually loop_forver, so let it try 3 times and then quit instead of endless blocking
+          @ssh.loop { loop_tries += 1 ; loop_tries < 4 }
+        rescue *RETRYABLE_EXCEPTIONS => e
+          @logger.debug "Connection on #{@hostname} failed as expected (#{e.class.name} - #{e.message})"
+          close #this connection is bad, shut it down
+          return true
+        end
+        sleep wait
+        (last_wait, wait) = wait, last_wait + wait
+        try += 1
+      end
+      false
+    end
+
     def try_to_execute command, options = {}, stdout_callback = nil,
                 stderr_callback = stdout_callback
 

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.10.0'
+    STRING = '2.11.0'
   end
 end

data/spec/beaker/answers_spec.rb

@@ -446,4 +446,60 @@ module Beaker
       end
     end
   end
+
+  describe 'Customization' do
+    let( :basic_hosts ) { make_hosts( { 'pe_ver' => @ver } ) }
+    let( :options )     { Beaker::Options::Presets.new.presets }
+    let( :hosts )       { basic_hosts[0]['roles'] = ['master', 'database', 'dashboard']
+                          basic_hosts[1]['platform'] = 'windows'
+                          basic_hosts }
+    let( :answers )     { Beaker::Answers.create(@ver, hosts, options) }
+
+    def test_answer_customization(answer_key, value_to_set)
+      @ver = '3.0'
+      options[:answers][answer_key] = value_to_set
+      host_answers = answers.answers['vm1']
+      expect( host_answers[answer_key] ).to be === value_to_set
+    end
+
+    it 'sets :q_puppetdb_hostname' do
+      test_answer_customization(:q_puppetdb_hostname, 'q_puppetdb_hostname_custom01')
+    end
+
+    it 'sets :q_puppetdb_database_user' do
+      test_answer_customization(:q_puppetdb_database_user, 'q_puppetdb_database_user_custom02')
+    end
+
+    it 'sets :q_puppetdb_database_password' do
+      test_answer_customization(:q_puppetdb_database_password, 'q_puppetdb_database_password_custom03')
+    end
+
+    it 'sets :q_puppet_enterpriseconsole_auth_database_password' do
+      answer = 'q_puppet_enterpriseconsole_auth_database_password_custom04'
+      test_answer_customization(:q_puppet_enterpriseconsole_auth_database_password, answer)
+    end
+
+    it 'sets :q_puppet_enterpriseconsole_database_user' do
+      answer = 'q_puppet_enterpriseconsole_database_user_custom05'
+      test_answer_customization(:q_puppet_enterpriseconsole_database_user, answer)
+    end
+
+    it 'sets :q_puppet_enterpriseconsole_database_password' do
+      answer = 'q_puppet_enterpriseconsole_database_password_custom06'
+      test_answer_customization(:q_puppet_enterpriseconsole_database_password, answer)
+    end
+
+    it 'sets :q_database_host' do
+      test_answer_customization(:q_database_host, 'q_database_host_custom07')
+    end
+
+    it 'sets :q_database_install' do
+      test_answer_customization(:q_database_install, 'q_database_install_custom08')
+    end
+
+    it 'sets :q_pe_database' do
+      test_answer_customization(:q_pe_database, 'q_pe_database_custom08')
+    end
+
+  end
 end

data/spec/beaker/cli_spec.rb

@@ -235,7 +235,7 @@ module Beaker
 
             cli.execute!
 
-            copied_hosts_file = File.join(File.absolute_path(dir), options[:hosts_file])
+            copied_hosts_file = File.join(File.absolute_path(dir), 'hosts_preserved.yml')
             expect( File.exists?(copied_hosts_file) ).to be_truthy
           end
         end
@@ -247,11 +247,24 @@ module Beaker
 
             cli.execute!
 
-            copied_hosts_file = File.join(File.absolute_path(dir), options[:hosts_file])
+            copied_hosts_file = File.join(File.absolute_path(dir), 'hosts_preserved.yml')
             expect{ YAML.load_file(copied_hosts_file) }.to_not raise_error
           end
         end
 
+        it 'sets :provision to false in the copied hosts file' do
+          options = cli.instance_variable_get(:@options)
+          Dir.mktmpdir do |dir|
+            options[:log_dated_dir] = File.absolute_path(dir)
+
+            cli.execute!
+
+            copied_hosts_file = File.join(File.absolute_path(dir), 'hosts_preserved.yml')
+            yaml_content = YAML.load_file(copied_hosts_file)
+            expect( yaml_content['CONFIG']['provision'] ).to be_falsy
+          end
+        end
+
         it 'sets the @options :hosts_preserved_yaml_file to the copied file' do
           options = cli.instance_variable_get(:@options)
           Dir.mktmpdir do |dir|
@@ -261,7 +274,7 @@ module Beaker
             cli.execute!
             expect( options.has_key?(:hosts_preserved_yaml_file) ).to be_truthy
 
-            copied_hosts_file = File.join(File.absolute_path(dir), options[:hosts_file])
+            copied_hosts_file = File.join(File.absolute_path(dir), 'hosts_preserved.yml')
             expect( options[:hosts_preserved_yaml_file] ).to be === copied_hosts_file
           end
         end
@@ -381,15 +394,6 @@ module Beaker
           answer = cli.build_hosts_preserved_reproducing_command(command_to_sub, 'can/talk/to/bears.yml')
           expect( answer.start_with?(command_correct) ).to be_truthy
         end
-
-        it 'adds a --no-provision flag to the end of the command' do
-          new_hosts_file  = 'john/deer/was/here.txt'
-          command_to_sub  = 'p --log-level debug johnnypantaloons7 --jankies --flag-business'
-          command_correct = command_to_sub + ' --no-provision'
-
-          answer = cli.build_hosts_preserved_reproducing_command(command_to_sub, new_hosts_file)
-          expect( answer ).to be === command_correct
-        end
       end
     end
   end

data/spec/beaker/command_spec.rb

@@ -45,15 +45,18 @@ module Beaker
       let(:host) { {'pathseparator' => ':'} }
 
       it 'returns a blank string if theres no env' do
+        expect( host ).to receive( :is_powershell? ).never
         expect( subject.environment_string_for(host, {}) ).to be == ''
       end
 
       it 'takes an env hash with var_name/value pairs' do
+        expect( host ).to receive( :is_powershell? ).and_return(false)
         expect( subject.environment_string_for(host, {:HOME => '/'}) ).
           to be == "env HOME=\"/\""
       end
 
       it 'takes an env hash with var_name/value[Array] pairs' do
+        expect( host ).to receive( :is_powershell? ).and_return(false)
         expect( subject.environment_string_for(host, {:LD_PATH => ['/', '/tmp']}) ).
           to be == "env LD_PATH=\"/:/tmp\""
       end

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

@@ -118,7 +118,7 @@ describe ClassMixedWithDSLInstallUtils do
       it{
         host = double("host")
         allow( host ).to receive(:[]).with('distmoduledir').and_return('/etc/puppetlabs/puppet/modules')
-        allow( host ).to receive(:is_cygwin?).and_return(true)
+        allow( host ).to receive(:is_powershell?).and_return(false)
         result = double
         stdout = target.split('/')[0..-2].join('/') + "\n"
         allow( result ).to receive(:stdout).and_return( stdout )
@@ -179,7 +179,7 @@ describe ClassMixedWithDSLInstallUtils do
         host = double("host")
         allow( host ).to receive(:[]).with('platform').and_return('windows')
         allow( host ).to receive(:[]).with('distmoduledir').and_return('C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules')
-        allow( host ).to receive(:is_cygwin?).and_return(false)
+        allow( host ).to receive(:is_powershell?).and_return(true)
 
         result = double
         allow( result ).to receive(:stdout).and_return( 'C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules' )

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

@@ -64,6 +64,7 @@ describe ClassMixedWithDSLInstallUtils do
     it 'generates a windows PE install command for a windows host' do
       winhost['dist'] = 'puppet-enterprise-3.0'
       allow( subject ).to receive( :hosts ).and_return( [ hosts[1], hosts[0], hosts[2], winhost ] )
+      allow( winhost ).to receive( :is_cygwin?).and_return(true)
       expect( subject.installer_cmd( winhost, {} ) ).to be === "cd /tmp && cmd /C 'start /w msiexec.exe /qn /L*V tmp.log /i puppet-enterprise-3.0.msi PUPPET_MASTER_SERVER=vm1 PUPPET_AGENT_CERTNAME=winhost'"
     end
 
@@ -167,6 +168,25 @@ describe ClassMixedWithDSLInstallUtils do
       subject.fetch_pe( [unixhost], {} )
     end
 
+    it 'can download a PE .tar from a URL to #fetch_and_push_pe' do
+      allow( File ).to receive( :directory? ).and_return( false ) #is not local
+      allow( subject ).to receive( :link_exists? ) do |arg|
+        if arg =~ /.tar.gz/ #there is no .tar.gz link, only a .tar
+          false
+        else
+          true
+        end
+      end
+      allow( subject ).to receive( :on ).and_return( true )
+
+      path = unixhost['pe_dir']
+      filename = "#{ unixhost['dist'] }"
+      extension = '.tar'
+      expect( subject ).to receive( :fetch_and_push_pe ).with( unixhost, anything, filename, extension ).once
+      expect( subject ).to receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; cat #{ filename }#{ extension } | tar -xvf -" ).once
+      subject.fetch_pe( [unixhost], {:fetch_local_then_push_to_host => true} )
+    end
+
     it 'can download a PE .tar.gz from a URL to a host and unpack it' do
       allow( File ).to receive( :directory? ).and_return( false ) #is not local
       allow( subject ).to receive( :link_exists? ).and_return( true ) #is a tar.gz
@@ -179,6 +199,19 @@ describe ClassMixedWithDSLInstallUtils do
       subject.fetch_pe( [unixhost], {} )
     end
 
+    it 'can download a PE .tar.gz from a URL to #fetch_and_push_pe' do
+      allow( File ).to receive( :directory? ).and_return( false ) #is not local
+      allow( subject ).to receive( :link_exists? ).and_return( true ) #is a tar.gz
+      allow( subject ).to receive( :on ).and_return( true )
+
+      path = unixhost['pe_dir']
+      filename = "#{ unixhost['dist'] }"
+      extension = '.tar.gz'
+      expect( subject ).to receive( :fetch_and_push_pe ).with( unixhost, anything, filename, extension ).once
+      expect( subject ).to receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; cat #{ filename }#{ extension } | gunzip | tar -xvf -" ).once
+      subject.fetch_pe( [unixhost], {:fetch_local_then_push_to_host => true} )
+    end
+
     it 'can download a PE .swix from a URL to an EOS host and unpack it' do
       allow( File ).to receive( :directory? ).and_return( false ) #is not local
       allow( subject ).to receive( :link_exists? ).and_return( true ) #is a tar.gz
@@ -253,7 +286,7 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive( :version_is_less ).with('3.0', '4.0').and_return( true )
       allow( subject ).to receive( :version_is_less ).with('3.0', '3.4').and_return( true )
       allow( subject ).to receive( :version_is_less ).with('3.0', '3.0').and_return( false )
-      allow( subject ).to receive( :version_is_less ).with('3.0', '3.4').and_return( true )
+      allow( subject ).to receive( :version_is_less ).with('3.0', '3.99').and_return( true )
       allow( subject ).to receive( :wait_for_host_in_dashboard ).and_return( true )
       allow( subject ).to receive( :puppet_agent ) do |arg|
         "puppet agent #{arg}"
@@ -356,7 +389,7 @@ describe ClassMixedWithDSLInstallUtils do
                                          "cd /tmp/2014-07-01_15.27.53/puppet-enterprise-3.0-linux ; nohup ./pe-installer <<<Y > higgs_2014-07-01_15.27.53.log 2>&1 &",
                                         opts ).once
       #check to see if the higgs installation has proceeded correctly, works on second check
-      expect( subject ).to receive( :on ).with( hosts[0], /cat #{hosts[0]['higgs_file']}/, { :acceptable_exit_codes => 0..255 }).and_return( @fail_result, @success_result )
+      expect( subject ).to receive( :on ).with( hosts[0], /cat #{hosts[0]['higgs_file']}/, { :accept_all_exit_codes => true }).and_return( @fail_result, @success_result )
       subject.do_higgs_install( hosts[0], opts )
     end
 
@@ -371,7 +404,7 @@ describe ClassMixedWithDSLInstallUtils do
                                          "cd /tmp/2014-07-01_15.27.53/puppet-enterprise-3.0-linux ; nohup ./pe-installer <<<Y > higgs_2014-07-01_15.27.53.log 2>&1 &",
                                         opts ).once
       #check to see if the higgs installation has proceeded correctly, works on second check
-      expect( subject ).to receive( :on ).with( hosts[0], /cat #{hosts[0]['higgs_file']}/, { :acceptable_exit_codes => 0..255 }).exactly(10).times.and_return( @fail_result )
+      expect( subject ).to receive( :on ).with( hosts[0], /cat #{hosts[0]['higgs_file']}/, { :accept_all_exit_codes => true }).exactly(10).times.and_return( @fail_result )
       expect{ subject.do_higgs_install( hosts[0], opts ) }.to raise_error
     end
 
@@ -472,4 +505,39 @@ describe ClassMixedWithDSLInstallUtils do
 
   end
 
+  describe 'fetch_and_push_pe' do
+
+    it 'fetches the file' do
+      allow( subject ).to receive( :scp_to )
+
+      path = 'abcde/fg/hij'
+      filename = 'pants'
+      extension = '.txt'
+      expect( subject ).to receive( :fetch_http_file ).with( path, "#{filename}#{extension}", 'tmp/pe' )
+      subject.fetch_and_push_pe(unixhost, path, filename, extension)
+    end
+
+    it 'allows you to set the local copy dir' do
+      allow( subject ).to receive( :scp_to )
+
+      path = 'defg/hi/j'
+      filename = 'pants'
+      extension = '.txt'
+      local_dir = '/root/domes'
+      expect( subject ).to receive( :fetch_http_file ).with( path, "#{filename}#{extension}", local_dir )
+      subject.fetch_and_push_pe(unixhost, path, filename, extension, local_dir)
+    end
+
+    it 'scp\'s to the host' do
+      allow( subject ).to receive( :fetch_http_file )
+
+      path = 'abcde/fg/hij'
+      filename = 'pants'
+      extension = '.txt'
+      expect( subject ).to receive( :scp_to ).with( unixhost, "tmp/pe/#{filename}#{extension}", unixhost['working_dir'] )
+      subject.fetch_and_push_pe(unixhost, path, filename, extension)
+    end
+
+  end
+
 end

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

@@ -27,7 +27,8 @@ describe ClassMixedWithDSLInstallUtils do
   let(:hosts_sorted)  { [ hosts[1], hosts[0], hosts[2], hosts[3] ] }
   let(:winhost)       { make_host( 'winhost', { :platform => 'windows',
                                                 :pe_ver => '3.0',
-                                                :working_dir => '/tmp' } ) }
+                                                :working_dir => '/tmp',
+                                                :is_cygwin => true} ) }
   let(:winhost_non_cygwin) { make_host( 'winhost_non_cygwin', { :platform => 'windows',
                                                 :pe_ver => '3.0',
                                                 :working_dir => '/tmp',
@@ -242,6 +243,7 @@ describe ClassMixedWithDSLInstallUtils do
     context 'on windows' do
       let(:platform) { "windows-2008r2-i386" }
       it 'installs specific version of puppet when passed :version' do
+        allow(hosts[0]).to receive(:is_cygwin?).and_return(true)
         allow(subject).to receive(:link_exists?).and_return( true )
         expect(subject).to receive(:on).with(hosts[0], 'curl -O http://downloads.puppetlabs.com/windows/puppet-3000.msi')
         expect(subject).to receive(:on).with(hosts[0], " echo 'export PATH=$PATH:\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\"' > /etc/bash.bashrc ")
@@ -249,6 +251,7 @@ describe ClassMixedWithDSLInstallUtils do
         subject.install_puppet(:version => '3000')
       end
       it 'installs from custom url when passed :win_download_url' do
+        allow(hosts[0]).to receive(:is_cygwin?).and_return(true)
         allow(subject).to receive(:link_exists?).and_return( true )
         expect(subject).to receive(:on).with(hosts[0], 'curl -O http://nightlies.puppetlabs.com/puppet-latest/repos/windows/puppet-3000.msi')
         expect(subject).to receive(:on).with(hosts[0], 'cmd /C \'start /w msiexec.exe /qn /i puppet-3000.msi\'')

data/spec/beaker/host/unix/pkg_spec.rb

@@ -29,7 +29,7 @@ module Beaker
         @opts = {'platform' => 'sles-is-me'}
         pkg = 'sles_package'
         expect( Beaker::Command ).to receive(:new).with("zypper se -i --match-exact #{pkg}").and_return('')
-        expect( instance ).to receive(:exec).with('', :acceptable_exit_codes => (0...127)).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
  
@@ -37,7 +37,7 @@ module Beaker
         @opts = {'platform' => 'fedora-is-me'}
         pkg = 'fedora_package'
         expect( Beaker::Command ).to receive(:new).with("rpm -q #{pkg}").and_return('')
-        expect( instance ).to receive(:exec).with('', :acceptable_exit_codes => (0...127)).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
@@ -45,7 +45,7 @@ module Beaker
         @opts = {'platform' => 'centos-is-me'}
         pkg = 'centos_package'
         expect( Beaker::Command ).to receive(:new).with("rpm -q #{pkg}").and_return('')
-        expect( instance ).to receive(:exec).with('', :acceptable_exit_codes => (0...127)).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
@@ -53,7 +53,7 @@ module Beaker
         @opts = {'platform' => 'eos-is-me'}
         pkg = 'eos-package'
         expect( Beaker::Command ).to receive(:new).with("rpm -q #{pkg}").and_return('')
-        expect( instance ).to receive(:exec).with('', :acceptable_exit_codes => (0...127)).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
@@ -61,7 +61,7 @@ module Beaker
         @opts = {'platform' => 'el-is-me'}
         pkg = 'el_package'
         expect( Beaker::Command ).to receive(:new).with("rpm -q #{pkg}").and_return('')
-        expect( instance ).to receive(:exec).with('', :acceptable_exit_codes => (0...127)).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
@@ -69,7 +69,7 @@ module Beaker
         @opts = {'platform' => 'debian-is-me'}
         pkg = 'debian_package'
         expect( Beaker::Command ).to receive(:new).with("dpkg -s #{pkg}").and_return('')
-        expect( instance ).to receive(:exec).with('', :acceptable_exit_codes => (0...127)).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
@@ -77,7 +77,7 @@ module Beaker
         @opts = {'platform' => 'ubuntu-is-me'}
         pkg = 'ubuntu_package'
         expect( Beaker::Command ).to receive(:new).with("dpkg -s #{pkg}").and_return('')
-        expect( instance ).to receive(:exec).with('', :acceptable_exit_codes => (0...127)).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
@@ -85,7 +85,7 @@ module Beaker
         @opts = {'platform' => 'cumulus-is-me'}
         pkg = 'cumulus_package'
         expect( Beaker::Command ).to receive(:new).with("dpkg -s #{pkg}").and_return('')
-        expect( instance ).to receive(:exec).with('', :acceptable_exit_codes => (0...127)).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
@@ -93,7 +93,7 @@ module Beaker
         @opts = {'platform' => 'solaris-11-is-me'}
         pkg = 'solaris-11_package'
         expect( Beaker::Command ).to receive(:new).with("pkg info #{pkg}").and_return('')
-        expect( instance ).to receive(:exec).with('', :acceptable_exit_codes => (0...127)).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
@@ -101,7 +101,7 @@ module Beaker
         @opts = {'platform' => 'solaris-10-is-me'}
         pkg = 'solaris-10_package'
         expect( Beaker::Command ).to receive(:new).with("pkginfo #{pkg}").and_return('')
-        expect( instance ).to receive(:exec).with('', :acceptable_exit_codes => (0...127)).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end