beaker 2.22.0 → 2.23.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzA4NmIzODhiN2FkMWIyM2RjZDE1YzAxMWE3ZDc1NGFhODBlMDRhOA==
+    MzNiNDI1OTkwY2JmOWI1ZjBlYTM1ODk1YWFlODc1YzFiZWFiMDgzMw==
   data.tar.gz: !binary |-
-    ODdjMmNhYTUwZmI2Yjc1ZjhlM2IxMjM1NGRkMjRiODNlMzMwYmM0ZA==
+    NTBlMjYyNWI1MGE1ZjhjNTBjZjI5YWNjZTQzMzM3N2Q2ZmJiMzRmOQ==
 SHA512:
   metadata.gz: !binary |-
-    NDM5ZTdkNWI4N2M3Y2NjZTk1NTMyNmNlMWE1MGRhMjUxMjg0YjMyMzM4ZWRi
-    M2M4ZTM5YTdiNmY4ZDhlOTJkMDBjMjZhMzAzOGY3ODhjMjgxM2FhODU4ZTJi
-    YTJiNWQ2YjJmMTM5OGUwZDYzOWRiNzFmYmQ2MGU3NmIyZDVkMjk=
+    MWIzYmNmNmUwOTJkZjhiZjNhZjMyY2U1MGUxZTAxOGM4MTU4NzczYzQ3OWJm
+    ZWZiYTZhMmFjMDA5ZTJjODg3YjM2YWNiMzY4OGY1NzdhMmRhN2UzZTU0MDQz
+    MTFmYmYwYmQ2ODk5YmU1NDE5ODc5NWY0M2FhMmQ2ZmY1NzNmMjY=
   data.tar.gz: !binary |-
-    M2U0YjRiMjYyZjczYzVhODA0NzE1MzkxODU4NTM0ODkzOWZhYjE4YzRmMTUy
-    MjQyNzAzNTNiM2VmYTVlYjE0MDg2OGMyMDU5MjE1N2UwM2Y4NjFiYTZlYWNh
-    MmQwMTRjMDkyMTYzZjZiODA1ZGU1YzQwMTFlZWViYjE0MjIxOGQ=
+    NWJhMTY1ZmMwY2E5NjMxMjRiMGI5N2Y1NjdlZmFlNWM2YzNiMmE2ZDliYzVk
+    ZDE3MjVlYTk4Y2UyOTcwMjAwZDhhMGIyNmEyMWFhN2FlNGU5OGIyNzlkZGU5
+    OThlZDBmMTBhNWQyZmUwNzFmOTA2MDBlMzBkNWVlMjNlMTk3YzA=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 1 Sep, 2015 (e693a4e7)](#LATEST)
+* [LATEST - 9 Sep, 2015 (db33f827)](#LATEST)
+* [2.22.0 - 1 Sep, 2015 (96ec20a7)](#2.22.0)
 * [2.21.0 - 26 Aug, 2015 (40281eb2)](#2.21.0)
 * [2.20.0 - 17 Aug, 2015 (8a419e98)](#2.20.0)
 * [2.19.0 - 13 Aug, 2015 (80897129)](#2.19.0)
@@ -94,7 +95,109 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 1 Sep, 2015 (e693a4e7)
+### <a name = "LATEST">LATEST - 9 Sep, 2015 (db33f827)
+
+* (GEM) update beaker version to 2.23.0 (db33f827)
+
+* Merge pull request #943 from MikaelSmith/imp/master/BKR-504 (e10c5491)
+
+
+```
+Merge pull request #943 from MikaelSmith/imp/master/BKR-504
+
+(BKR-504) Update Solaris package name for release version
+```
+* (BKR-504) Update Solaris package name for release version (44602018)
+
+
+```
+(BKR-504) Update Solaris package name for release version
+
+The planned Solaris package names for the puppet-agent package were
+changed to incorporate a release version, as already handled for other
+platforms. Update the Solaris package name to include the hard-coded
+release `1` naming.
+```
+* Merge pull request #942 from kevpl/bkr497_f5_skipconfigure (5a783a91)
+
+
+```
+Merge pull request #942 from kevpl/bkr497_f5_skipconfigure
+
+(BKR-497) skip configuration for f5 hosts
+```
+* Merge pull request #940 from anodelman/preserved-hosts (fe8df0b0)
+
+
+```
+Merge pull request #940 from anodelman/preserved-hosts
+
+(BKR-440) host_preserved.yml file should disable the pre_suite
+```
+* (BKR-497) fixed set_env to skip f5 platforms (a6301f24)
+
+* (BKR-497) skip configuration for f5 hosts (87bdf9b7)
+
+* Merge pull request #941 from kevpl/bkr469_ec2_keys (d16fef00)
+
+
+```
+Merge pull request #941 from kevpl/bkr469_ec2_keys
+
+(BKR-469) added f5 wait checks
+```
+* (BKR-469) added f5 platform specific provisioning wait checks (8f5a9464)
+
+* (BKR-440) host_preserved.yml file should disable the pre_suite (1b6e0bec)
+
+
+```
+(BKR-440) host_preserved.yml file should disable the pre_suite
+
+- instead of just removing the pre_suite/post_suite/tests from
+the options, explicitly set it to be []
+- this means that you don't end up accidentally running a pre-suite
+  defined in a secondary options file
+```
+* (BKR-469) added options_hash-provided keys to aws public_key check (274d5df9)
+
+* Merge pull request #937 from puppetlabs/maint/constrain-add_system32_hosts_entry-to-pswindows (a7857fab)
+
+
+```
+Merge pull request #937 from puppetlabs/maint/constrain-add_system32_hosts_entry-to-pswindows
+
+(MAINT) constrain `add_system32_hosts_entry`
+```
+* (MAINT) remove spec tests for add_system32_hosts_entry (bd76ee56)
+
+
+```
+(MAINT) remove spec tests for add_system32_hosts_entry
+
+These tests do not actually exercise the code path in question -- had they
+exercised that code path, we would have known earlier that this helper only
+works on powershell systems.
+
+We have replacement tests coming in BKR-358 which will exercise this code path
+more fully (they are what exposed this problem), so removing these tests in
+favor landing those.
+```
+* (MAINT) constrain `add_system32_hosts_entry` (88e86059)
+
+
+```
+(MAINT) constrain `add_system32_hosts_entry`
+
+Prior to this commit, this method was available to any windows platform,
+including cygwin-enabled windows installed. This method only actually works
+on non-cygwin windows platforms, and this discrepancy was uncovered during
+work for BKR-358, where we are adding acceptance tests for the host helper
+methods.
+```
+### <a name = "2.22.0">2.22.0 - 1 Sep, 2015 (96ec20a7)
+
+* (HISTORY) update beaker history for gem release 2.22.0 (96ec20a7)
 
 * (GEM) update beaker version to 2.22.0 (e693a4e7)
 

data/lib/beaker/cli.rb

@@ -166,7 +166,11 @@ module Beaker
     # @return nil
     def preserve_hosts_file
       # things that don't belong in the preserved host file
-      dontpreserve = /HOSTS|logger|timestamp|log_prefix|_dated_dir|logger_sut|pre_suite|post_suite|tests/
+      dontpreserve = /HOSTS|logger|timestamp|log_prefix|_dated_dir|logger_sut/
+      # set the pre/post/tests to be none
+      @options[:pre_suite] = []
+      @options[:post_suite] = []
+      @options[:tests] = []
       preserved_hosts_filename = File.join(@options[:log_dated_dir], 'hosts_preserved.yml')
       FileUtils.cp(@options[:hosts_file], preserved_hosts_filename)
       hosts_yaml = YAML.load_file(preserved_hosts_filename)

data/lib/beaker/dsl/helpers/host_helpers.rb

@@ -12,7 +12,7 @@ module Beaker
         #     (or range) of integer exit codes that should be considered
         #     acceptable.  An error will be thrown if the exit code does not
         #     match one of the values in this list.
-        #   @option opts [Boolean] :accept_all_exit_codes (false) Consider all 
+        #   @option opts [Boolean] :accept_all_exit_codes (false) Consider all
         #     exit codes as passing.
         #   @option opts [Boolean] :dry_run (false) Do not actually execute any
         #     commands on the SUT
@@ -331,7 +331,7 @@ module Beaker
         #
         # @return nil
         def add_system32_hosts_entry(host, opts = {})
-          if host['platform'] =~ /windows/
+          if host.is_powershell?
             hosts_file = "C:\\Windows\\System32\\Drivers\\etc\\hosts"
             host_entry = "#{opts['ip']}`t`t#{opts['name']}"
             on host, powershell("\$text = \\\"#{host_entry}\\\"; Add-Content -path '#{hosts_file}' -value \$text")

data/lib/beaker/dsl/install_utils/foss_utils.rb

@@ -1148,8 +1148,11 @@ module Beaker
                 # Solaris 10 uses / as the root user directory. Solaris 11 uses /root.
                 onhost_copy_base = '/'
               end
-              release_path << "/solaris/#{version}/#{opts[:puppet_collection]}"
-              release_file = "puppet-agent-#{opts[:puppet_agent_version]}.#{arch}.pkg.gz"
+              release_path << "solaris/#{version}/#{opts[:puppet_collection]}"
+              release_file = "puppet-agent-#{opts[:puppet_agent_version]}-1.#{arch}.pkg.gz"
+              if not link_exists?("#{release_path}/#{release_file}")
+                release_file = "puppet-agent-#{opts[:puppet_agent_version]}.#{arch}.pkg.gz"
+              end
             else
               raise "No repository installation step for #{variant} yet..."
             end

data/lib/beaker/host_prebuilt_steps.rb

@@ -501,6 +501,7 @@ module Beaker
       logger = opts[:logger]
 
       block_on host do |host|
+        next if host['platform'] =~ /f5/
         env = construct_env(host, opts)
         logger.debug("setting local environment on #{host.name}")
         case host['platform']

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -47,6 +47,8 @@ module Beaker
       # Perform the main launch work
       launch_all_nodes()
 
+      wait_for_status_f5()
+
       # Add metadata tags to each instance
       add_tags()
 
@@ -422,9 +424,13 @@ module Beaker
     #
     # @param status [Symbol] EC2 state to wait for, :running :stopped etc.
     # @param instances Enumerable<Hash{Symbol=>EC2::Instance,Host}>
+    # @param block [Proc] more complex checks can be made by passing a
+    #                     block in.  This overrides the status parameter.
+    #                     EC2::Instance objects from the hosts will be
+    #                     yielded to the passed block
     # @return [void]
     # @api private
-    def wait_for_status(status, instances)
+    def wait_for_status(status, instances, &block)
       # Wait for each node to reach status :running
       @logger.notify("aws-sdk: Waiting for all hosts to be #{status}")
       instances.each do |x|
@@ -436,7 +442,12 @@ module Beaker
         # TODO: should probably be a in a shared method somewhere
         for tries in 1..10
           begin
-            if instance.status == status
+            if block_given?
+              test_result = yield instance
+            else
+              test_result = instance.status == status
+            end
+            if test_result
               # Always sleep, so the next command won't cause a throttle
               backoff_sleep(tries)
               break
@@ -451,6 +462,29 @@ module Beaker
       end
     end
 
+    # Handles special checks needed for f5 platforms.
+    #
+    # @note if any host is an f5 one, these checks will happen once across all
+    #   of the hosts, and then we'll exit
+    #
+    # @return [void]
+    # @api private
+    def wait_for_status_f5()
+      @hosts.each do |host|
+        if host['platform'] =~ /f5/
+          wait_for_status(:running, @hosts)
+
+          wait_for_status(nil, @hosts) do |instance|
+            instance_status_collection = instance.client.describe_instance_status({:instance_ids => [instance.id]})
+            first_instance = instance_status_collection[:instance_status_set].first
+            first_instance[:system_status][:status] == "ok"
+          end
+
+          break
+        end
+      end
+    end
+
     # Add metadata tags to all instances
     #
     # @return [void]
@@ -504,10 +538,13 @@ module Beaker
 
     # Configure /etc/hosts for each node
     #
+    # @note f5 hosts are skipped since this isn't a valid step there
+    #
     # @return [void]
     # @api private
     def configure_hosts
       @hosts.each do |host|
+        next if host['platform'] =~ /f5/
         host_entries = @hosts.map do |h|
           h == host ? etc_hosts_entry(h, :private_ip) : etc_hosts_entry(h)
         end
@@ -611,15 +648,21 @@ module Beaker
     # @return [String] contents of public key
     # @api private
     def public_key
-      filename = File.expand_path('~/.ssh/id_rsa.pub')
-      unless File.exists? filename
-        filename = File.expand_path('~/.ssh/id_dsa.pub')
-        unless File.exists? filename
-          raise RuntimeError, 'Expected either ~/.ssh/id_rsa.pub or ~/.ssh/id_dsa.pub but found neither'
-        end
+      keys = Array(@options[:ssh][:keys])
+      keys << '~/.ssh/id_rsa'
+      keys << '~/.ssh/id_dsa'
+      key_file = nil
+      keys.each do |key|
+        key_filename = File.expand_path(key + '.pub')
+        key_file = key_filename if File.exists?(key_filename)
       end
 
-      File.read(filename)
+      if key_file
+        @logger.debug("Using public key: #{key_file}")
+      else
+        raise RuntimeError, "Expected to find a public key, but couldn't in #{keys}"
+      end
+      File.read(key_file)
     end
 
     # Generate a reusable key name from the local hosts hostname

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.22.0'
+    STRING = '2.23.0'
   end
 end

data/spec/beaker/cli_spec.rb

@@ -191,6 +191,39 @@ module Beaker
         end
       end
 
+      describe "#preserve_hosts_file" do
+        it 'removes the pre-suite/post-suite/tests and sets to []' do
+          hosts =  make_hosts
+          options = cli.instance_variable_get(:@options)
+          options[:log_dated_dir] = Dir.mktmpdir
+          File.open("sample.cfg", "w+") do |file|
+            file.write("HOSTS:\n")
+            hosts.each do |host|
+              file.write("  #{host.name}:\n")
+              file.write("    roles:\n")
+              host[:roles].each do |role|
+                file.write("      - #{role}\n")
+              end
+              file.write("    platform: #{host[:platform]}\n")
+            end
+            file.write("CONFIG:\n")
+          end
+          options[:hosts_file] = 'sample.cfg'
+          options[:pre_suite] = ['pre1', 'pre2', 'pre3']
+          options[:post_suite] = ['post1']
+          options[:tests] = ['test1', 'test2']
+
+          cli.instance_variable_set(:@options, options)
+          cli.instance_variable_set(:@hosts, hosts)
+
+          preserved_file = cli.preserve_hosts_file
+          hosts_yaml = YAML.load_file(preserved_file)
+          expect(hosts_yaml['CONFIG'][:tests]).to be == []
+          expect(hosts_yaml['CONFIG'][:pre_suite]).to be == []
+          expect(hosts_yaml['CONFIG'][:post_suite]).to be == []
+        end
+      end
+
       describe 'hosts file saving when preserve_hosts should happen' do
 
         before :each do

data/spec/beaker/dsl/helpers/host_helpers_spec.rb

@@ -48,7 +48,6 @@ describe ClassMixedWithDSLHelpers do
       expect( master ).to receive( :exec ).once
 
       subject.on( 'master', 'echo hello')
-
     end
 
     it 'if the host is a Symbol Object, finds the matching hsots with that Symbol as role' do
@@ -57,7 +56,6 @@ describe ClassMixedWithDSLHelpers do
       expect( master ).to receive( :exec ).once
 
       subject.on( :master, 'echo hello')
-
     end
 
     it 'delegates to itself for each host passed' do
@@ -159,7 +157,6 @@ describe ClassMixedWithDSLHelpers do
         end
       end
     end
-
   end
 
   describe "#retry_on" do
@@ -337,7 +334,6 @@ describe ClassMixedWithDSLHelpers do
           subject.create_tmpdir_on(host, "/tmp/bogus")
         end
       end
-
     end
 
     context 'with an valid user argument' do
@@ -358,7 +354,6 @@ describe ClassMixedWithDSLHelpers do
         }.to raise_error(RuntimeError, /User curiousgeorge does not exist on/)
       end
     end
-
   end
 
   describe '#run_script_on' do
@@ -378,36 +373,4 @@ describe ClassMixedWithDSLHelpers do
       subject.run_script( '/tmp/test.sh' )
     end
   end
-
-  describe '#add_system32_hosts_entry' do
-    before do
-      allow( subject ).to receive(:on).and_return(Beaker::Result.new({},''))
-    end
-    context 'on debian' do
-      let(:platform) { 'debian-7-amd64' }
-      let(:host) { make_host('testbox.test.local', :platform => 'debian-7-amd64') }
-      it 'logs message - nothing to do on this host' do
-        expect( Beaker::Command ).to receive( :new ).never
-
-        expect {
-          subject.add_system32_hosts_entry(host, {})
-        }.to raise_error
-      end
-    end
-    context 'on windows' do
-      let(:platform) { 'windows-2008R2-amd64' }
-      let(:host) { make_host('testbox.test.local', :platform => 'windows-2008R2-amd64') }
-      it 'it add an entry into the /etc/hosts file' do
-        entry = { 'ip' => '23.251.154.122', 'name' => 'forge.puppetlabs.com' }
-        expect(subject).to receive(:on) do |host, command|
-          expect(command.command).to eq('powershell.exe')
-          expect(command.args).to eq(["-ExecutionPolicy Bypass", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command $text = \\\"23.251.154.122`t`tforge.puppetlabs.com\\\"; Add-Content -path 'C:\\Windows\\System32\\Drivers\\etc\\hosts' -value $text"])
-        end
-
-
-        subject.add_system32_hosts_entry(host, entry)
-      end
-    end
-  end
-
 end

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

@@ -1080,6 +1080,15 @@ describe ClassMixedWithDSLInstallUtils do
       end
 
       it "copies package to the root directory and installs it" do
+        expect( subject ).to receive( :link_exists? ).with(/puppet-agent-1\.0\.0-1\.i386\.pkg\.gz/).and_return( true )
+        expect( subject ).to receive( :scp_to ).with( host, /\/puppet-agent-1\.0\.0\-1.i386\.pkg\.gz/, '/' )
+        expect( subject ).to receive( :create_remote_file ).with( host, '/noask', /noask file/m )
+        expect( subject ).to receive( :on ).with( host, 'gunzip -c puppet-agent-1.0.0-1.i386.pkg.gz | pkgadd -d /dev/stdin -a noask -n all' )
+        test_fetch_http_file
+      end
+
+      it "copies old package to the root directory and installs it" do
+        expect( subject ).to receive( :link_exists? ).with(/puppet-agent-1\.0\.0-1\.i386\.pkg\.gz/).and_return( false )
         expect( subject ).to receive( :scp_to ).with( host, /\/puppet-agent-1\.0\.0\.i386\.pkg\.gz/, '/' )
         expect( subject ).to receive( :create_remote_file ).with( host, '/noask', /noask file/m )
         expect( subject ).to receive( :on ).with( host, 'gunzip -c puppet-agent-1.0.0.i386.pkg.gz | pkgadd -d /dev/stdin -a noask -n all' )
@@ -1093,6 +1102,15 @@ describe ClassMixedWithDSLInstallUtils do
       end
 
       it "copies package to the root user directory and installs it" do
+        expect( subject ).to receive( :link_exists? ).with(/puppet-agent-1\.0\.0-1\.i386\.pkg\.gz/).and_return( true )
+        expect( subject ).to receive( :scp_to ).with( host, /\/puppet-agent-1\.0\.0-1\.i386\.pkg\.gz/, '/root' )
+        expect( subject ).to receive( :create_remote_file ).with( host, '/root/noask', /noask file/m )
+        expect( subject ).to receive( :on ).with( host, 'gunzip -c puppet-agent-1.0.0-1.i386.pkg.gz | pkgadd -d /dev/stdin -a noask -n all' )
+        test_fetch_http_file
+      end
+
+      it "copies old package to the root directory and installs it" do
+        expect( subject ).to receive( :link_exists? ).with(/puppet-agent-1\.0\.0-1\.i386\.pkg\.gz/).and_return( false )
         expect( subject ).to receive( :scp_to ).with( host, /\/puppet-agent-1\.0\.0\.i386\.pkg\.gz/, '/root' )
         expect( subject ).to receive( :create_remote_file ).with( host, '/root/noask', /noask file/m )
         expect( subject ).to receive( :on ).with( host, 'gunzip -c puppet-agent-1.0.0.i386.pkg.gz | pkgadd -d /dev/stdin -a noask -n all' )

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -553,6 +553,32 @@ describe Beaker do
       set_env_helper('freebsd', commands)
     end
 
+    it "skips an f5 host correctly" do
+      host = make_host('name', {
+         :platform     => 'f5-stuff',
+         :ssh_env_file => 'ssh_env_file',
+         :is_cygwin   => true,
+      } )
+      opts = {
+        :env1_key => :env1_value,
+        :env2_key => :env2_value
+      }
+
+      expect( subject ).to receive( :construct_env ).exactly(0).times
+
+      expect( Beaker::Command ).to receive( :new ).exactly(0).times
+      expect( Beaker::Command ).to receive( :new ).exactly(0).times
+      expect( Beaker::Command ).to receive( :new ).exactly(0).times
+      expect( Beaker::Command ).to receive( :new ).exactly(0).times
+      expect( host ).to receive( :add_env_var ).exactly(0).times
+      opts.each_pair do |key, value|
+        expect( host ).to receive( :add_env_var ).with( key, value ).exactly(0).times
+      end
+      expect( host ).to receive( :exec ).exactly(0).times
+
+      subject.set_env(host, options.merge( opts ))
+    end
+
     def set_env_helper(platform_name, host_specific_commands_array)
       host = make_host('name', {
           :platform     => platform_name,

data/spec/beaker/hypervisor/aws_sdk_spec.rb

@@ -55,10 +55,12 @@ module Beaker
       end
 
       it 'should step through provisioning' do
+        allow( aws ).to receive( :wait_for_status_f5 )
         aws.provision
       end
 
       it 'should return nil' do
+        allow( aws ).to receive( :wait_for_status_f5 )
         expect(aws.provision).to be_nil
       end
     end
@@ -258,10 +260,23 @@ module Beaker
       let( :instance_set ) { [{:instance => aws_instance}] }
       subject(:wait_for_status) { aws.wait_for_status(:running, instance_set) }
 
-      it 'handles a single instance' do
-        allow(aws_instance).to receive(:status).and_return(:waiting, :waiting, :running)
-        expect(aws).to receive(:backoff_sleep).exactly(3).times
-        expect(wait_for_status).to eq(instance_set)
+      context 'single instance' do
+        it 'behaves correctly in typical case' do
+          allow(aws_instance).to receive(:status).and_return(:waiting, :waiting, :running)
+          expect(aws).to receive(:backoff_sleep).exactly(3).times
+          expect(wait_for_status).to eq(instance_set)
+        end
+
+        it 'executes block correctly instead of status if given one' do
+          barn_value = 'did you grow up in a barn?'
+          allow(aws_instance).to receive( :[] ).with( :barn ) { barn_value }
+          expect(aws_instance).to receive(:status).exactly(0).times
+          expect(aws).to receive(:backoff_sleep).exactly(1).times
+          aws.wait_for_status(:running, instance_set) do |instance|
+            expect( instance[:barn] ).to be === barn_value
+            true
+          end
+        end
       end
 
       context 'with multiple instances' do
@@ -278,6 +293,17 @@ module Beaker
           expect(aws).to receive(:backoff_sleep).exactly(6).times
           expect(wait_for_status).to eq(instance_set)
         end
+
+        it 'executes block correctly instead of status if given one' do
+          barn_value = 'did you grow up in a barn?'
+          not_barn_value = 'notabarn'
+          allow(aws_instance).to receive( :[] ).with( :barn ).and_return(not_barn_value, barn_value, not_barn_value, barn_value)
+          allow(aws_instance).to receive(:status).and_return(:waiting)
+          expect(aws).to receive(:backoff_sleep).exactly(4).times
+          aws.wait_for_status(:running, instance_set) do |instance|
+            instance[:barn] == barn_value
+          end
+        end
       end
 
       context 'after 10 tries' do
@@ -286,6 +312,12 @@ module Beaker
           expect(aws).to receive(:backoff_sleep).exactly(9).times
           expect { wait_for_status }.to raise_error('Instance never reached state running')
         end
+
+        it 'still raises RuntimeError if given a block' do
+          expect(aws_instance).to receive(:status).and_return(:waiting).exactly(10).times
+          expect(aws).to receive(:backoff_sleep).exactly(9).times
+          expect { wait_for_status { false } }.to raise_error('Instance never reached state running')
+        end
       end
 
       context 'with an invalid instance' do
@@ -440,8 +472,9 @@ module Beaker
       it { is_expected.to be_nil }
 
       context 'calls #set_etc_hosts' do
-        it 'for each host' do
-          expect(aws).to receive(:set_etc_hosts).exactly(@hosts.size).times
+        it 'for each host (except the f5 ones)' do
+          non_f5_hosts = @hosts.select{ |h| !(h['platform'] =~ /f5/) }
+          expect(aws).to receive(:set_etc_hosts).exactly(non_f5_hosts.size).times
           expect(configure_hosts).to be_nil
         end
 
@@ -528,17 +561,42 @@ module Beaker
     describe '#public_key' do
       subject(:public_key) { aws.public_key }
 
-      it "retrieves contents from local ~/.ssh/ssh_rsa.pub file" do
+      it "retrieves contents from local ~/.ssh/id_rsa.pub file" do
         # Stub calls to file read/exists
+        key_value = 'foobar_Rsa'
+        allow(File).to receive(:exists?).with(/id_dsa.pub/) { false }
         allow(File).to receive(:exists?).with(/id_rsa.pub/) { true }
-        allow(File).to receive(:read).with(/id_rsa.pub/) { "foobar" }
+        allow(File).to receive(:read).with(/id_rsa.pub/) { key_value }
 
         # Should return contents of allow( previously ).to receivebed id_rsa.pub
-        expect(public_key).to eq("foobar")
+        expect(public_key).to be === key_value
+      end
+
+      it "retrieves contents from local ~/.ssh/id_dsa.pub file" do
+        # Stub calls to file read/exists
+        key_value = 'foobar_Dsa'
+        allow(File).to receive(:exists?).with(/id_rsa.pub/) { false }
+        allow(File).to receive(:exists?).with(/id_dsa.pub/) { true }
+        allow(File).to receive(:read).with(/id_dsa.pub/) { key_value }
+
+        expect(public_key).to be === key_value
       end
 
       it "should return an error if the files do not exist" do
-        expect { public_key }.to raise_error(RuntimeError, /Expected either/)
+        expect { public_key }.to raise_error(RuntimeError, /Expected to find a public key/)
+      end
+
+      it "uses options-provided keys" do
+        opts = aws.instance_variable_get( :@options )
+        opts[:ssh][:keys] = ['fake_key1', 'fake_key2']
+        aws.instance_variable_set( :@options, opts )
+
+        key_value = 'foobar_Custom2'
+        allow(File).to receive(:exists?).with(anything) { false }
+        allow(File).to receive(:exists?).with(/fake_key2/) { true }
+        allow(File).to receive(:read).with(/fake_key2/) { key_value }
+
+        expect(public_key).to be === key_value
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.22.0
+  version: 2.23.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec