beaker 4.38.1 → 4.39.0

data/lib/beaker/shared/host_manager.rb

@@ -24,7 +24,7 @@ module Beaker
       #@return [Array<Host>] The hosts that have the desired name/vmhostname/ip
       def hosts_with_name(hosts, name = nil)
         hosts.select do |host|
-          name.nil? or host.name =~ /\A#{name}/ or host[:vmhostname] =~ /\A#{name}/ or host[:ip] =~ /\A#{name}/
+          name.nil? or host.name&.start_with?(name) or host[:vmhostname]&.start_with?(name) or host[:ip]&.start_with?(name)
         end
       end
 
@@ -59,16 +59,15 @@ module Beaker
       def find_at_most_one_host_with_role(hosts, role)
         raise ArgumentError, "role cannot be nil." if role.nil?
         role_hosts = hosts_with_role(hosts, role)
-        host_with_role = nil
         case role_hosts.length
         when 0
+          nil
         when 1
-          host_with_role = role_hosts[0]
+          role_hosts[0]
         else
           host_string = ( role_hosts.map { |host| host.name } ).join( ', ')
           raise ArgumentError, "There should be only one host with #{role} defined, but I found #{role_hosts.length} (#{host_string})"
         end
-        host_with_role
       end
 
       # Execute a block selecting the hosts that match with the provided criteria
@@ -107,7 +106,7 @@ module Beaker
           if block_hosts.length > 0
             if run_in_parallel? opts
               # Pass caller[1] - the line that called block_on - for logging purposes.
-              result = block_hosts.map.each_in_parallel(caller[1]) do |h|
+              result = block_hosts.map.each_in_parallel(caller(2..2).first) do |h|
                 run_block_on h, &block
               end
               hosts.each{|host| host.close}# For some reason, I have to close the SSH connection

data/lib/beaker/shared/repetition.rb

@@ -7,22 +7,22 @@ module Beaker
         repeat_for_and_wait seconds, 1, &block
       end
 
-      def repeat_for_and_wait seconds, wait, &block
+      def repeat_for_and_wait seconds, wait
         timeout = Time.now + seconds
         done = false
         until done or timeout < Time.now do
-          done = block.call
+          done = yield
           sleep wait unless done
         end
         return done
       end
 
-      def repeat_fibonacci_style_for attempts, &block
+      def repeat_fibonacci_style_for attempts
         done = false
         attempt = 1
         last_wait, wait = 0, 1
         while not done and attempt <= attempts do
-          done = block.call
+          done = yield
           attempt += 1
           sleep wait unless done
           last_wait, wait = wait, last_wait + wait

data/lib/beaker/shared/semvar.rb

@@ -29,10 +29,10 @@ module Beaker
         #checks all dots, they are equal so examine the rest
         a_rest = a.split('-').drop(1)
         a_is_release = a_rest.empty?
-        a_is_rc = !a_is_release && !!(a_rest[0] =~ /rc\d+/)
+        a_is_rc = !a_is_release && /rc\d+/.match?(a_rest[0])
         b_rest = b.split('-').drop(1)
         b_is_release = b_rest.empty?
-        b_is_rc = !b_is_release && !!(b_rest[0] =~ /rc\d+/)
+        b_is_rc = !b_is_release && /rc\d+/.match?(b_rest[0])
 
         if a_is_release && b_is_release
           # They are equal

data/lib/beaker/shared/timed.rb

@@ -2,9 +2,9 @@ module Beaker
   module Shared
     module Timed
 
-      def run_and_report_duration &block
+      def run_and_report_duration
         start = Time.now
-        block.call
+        yield
         Time.now - start
       end
 

data/lib/beaker/ssh_connection.rb

@@ -108,7 +108,7 @@ module Beaker
       while (not @ssh) && (not methods.empty?) do
         unless instance_variable_get("@#{methods[0]}").nil?
           if SUPPORTED_CONNECTION_METHODS.include?(methods[0])
-            @ssh = connect_block(instance_variable_get("@#{methods[0].to_s}"), @user, @ssh_opts, options)
+            @ssh = connect_block(instance_variable_get("@#{methods[0]}"), @user, @ssh_opts, options)
           else
             @logger.warn "Beaker does not support #{methods[0]} to SSH to host, trying next available method."
             @ssh_connection_preference.delete(methods[0])
@@ -243,7 +243,7 @@ module Beaker
     end
 
     def request_terminal_for channel, command
-      channel.request_pty do |ch, success|
+      channel.request_pty do |_ch, success|
         if success
           @logger.debug "Allocated a PTY on #{@hostname} for #{command.inspect}"
         else
@@ -254,7 +254,7 @@ module Beaker
     end
 
     def register_stdout_for channel, output, callback = nil
-      channel.on_data do |ch, data|
+      channel.on_data do |_ch, data|
         callback[data] if callback
         output.stdout << data
         output.output << data
@@ -262,7 +262,7 @@ module Beaker
     end
 
     def register_stderr_for channel, output, callback = nil
-      channel.on_extended_data do |ch, type, data|
+      channel.on_extended_data do |_ch, type, data|
         if type == 1
           callback[data] if callback
           output.stderr << data
@@ -272,7 +272,7 @@ module Beaker
     end
 
     def register_exit_code_for channel, output
-      channel.on_request("exit-status") do |ch, data|
+      channel.on_request("exit-status") do |_ch, data|
         output.exit_code = data.read_long
       end
     end
@@ -301,9 +301,9 @@ module Beaker
       begin
         # This is probably windows with an environment variable so we need to
         # expand it.
-        target = self.execute(%{echo "#{target}"}).output.strip.gsub('"','') if target.include?('%')
+        target = self.execute(%{echo "#{target}"}).output.strip.delete('"') if target.include?('%')
 
-        @ssh.scp.upload! source, target, local_opts do |ch, name, sent, total|
+        @ssh.scp.upload! source, target, local_opts do |_ch, name, sent, total|
           result.stdout << "\tcopying %s: %10d/%d\n" % [name, sent, total]
         end
       rescue => e
@@ -337,9 +337,9 @@ module Beaker
       begin
         # This is probably windows with an environment variable so we need to
         # expand it.
-        source = self.execute(%{echo "#{source}"}).output.strip.gsub('"','') if source.include?('%')
+        source = self.execute(%{echo "#{source}"}).output.strip.delete('"') if source.include?('%')
 
-        @ssh.scp.download! source, target, local_opts do |ch, name, sent, total|
+        @ssh.scp.download! source, target, local_opts do |_ch, name, sent, total|
           result.stdout << "\tcopying %s: %10d/%d\n" % [name, sent, total]
         end
       rescue => e

data/lib/beaker/subcommand.rb

@@ -28,7 +28,7 @@ module Beaker
     class_option :'pre-suite', :type => :string, :group => 'Beaker run'
     class_option :'post-suite', :type => :string, :group => 'Beaker run'
     class_option :'pre-cleanup', :type => :string, :group => 'Beaker run'
-    class_option :'provision', :type => :boolean, :group => 'Beaker run'
+    class_option :provision, :type => :boolean, :group => 'Beaker run'
     class_option :'preserve-hosts', :type => :string, :group => 'Beaker run'
     class_option :'preserve-state', :type => :boolean, :group => 'Beaker run'
     class_option :'root-keys', :type => :boolean, :group => 'Beaker run'
@@ -48,14 +48,14 @@ module Beaker
     class_option :'repo-proxy', :type => :boolean, :group => 'Beaker run'
     class_option :'add-el-extras', :type => :boolean, :group => 'Beaker run'
     class_option :'package-proxy', :type => :string, :group => 'Beaker run'
-    class_option :'validate', :type => :boolean, :group => 'Beaker run'
+    class_option :validate, :type => :boolean, :group => 'Beaker run'
     class_option :'collect-perf-data', :type => :boolean, :group => 'Beaker run'
     class_option :'parse-only', :type => :boolean, :group => 'Beaker run'
     class_option :tag, :type => :string, :group => 'Beaker run'
     class_option :'exclude-tags', :type => :string, :group => 'Beaker run'
     class_option :'xml-time-order', :type => :boolean, :group => 'Beaker run'
     class_option :'debug-errors', :type => :boolean, :group => 'Beaker run'
-    class_option :'exec_manual_tests', :type => :boolean, :group => 'Beaker run'
+    class_option :exec_manual_tests, :type => :boolean, :group => 'Beaker run'
     class_option :'test-tag-exclude', :type => :string, :group => 'Beaker run'
     class_option :'test-tag-and', :type => :string, :group => 'Beaker run'
     class_option :'test-tag-or', :type => :string, :group => 'Beaker run'
@@ -124,7 +124,7 @@ module Beaker
 
       # Update each host provisioned with a flag indicating that it no longer needs
       # provisioning
-      cleaned_hosts.each do |host, host_hash|
+      cleaned_hosts.each do |_host, host_hash|
         host_hash['provision'] = false
       end
 
@@ -186,11 +186,11 @@ module Beaker
             path.to_s
           end
         end.flatten
-      elsif resources.all? { |r| r =~ /^(pre-suite|tests|post-suite|pre-cleanup)$/ }
+      elsif resources.all? { |r| /^(pre-suite|tests|post-suite|pre-cleanup)$/.match?(r) }
         # The regex match here is loose so that users can supply multiple suites,
         # such as `beaker exec pre-suite,tests`.
         beaker_suites.each do |suite|
-          @cli.options[suite] = [] unless resource.gsub(/-/, '_').match(suite.to_s)
+          @cli.options[suite] = [] unless resource.tr('-', '_').match(suite.to_s)
         end
       else
         raise ArgumentError, "Unable to parse #{resource} with beaker exec"

data/lib/beaker/tasks/quick_start.rb

@@ -10,7 +10,7 @@ VMPOOLER = ['redhat7-64default.mdcal-redhat7-64af']
 namespace :beaker_quickstart do
 
   desc 'Generate Default Beaker Host Config File, valid options are: vmpooler or vagrant.'
-  task :gen_hosts, [:hypervisor] do |t, args|
+  task :gen_hosts, [:hypervisor] do |_t, args|
     hosts_file = "#{CONFIG_DIR}/default_#{args[:hypervisor]}_hosts.yaml"
     if args[:hypervisor] == 'vagrant'
       cli = VAGRANT
@@ -72,7 +72,7 @@ end")
   desc 'Run Default Smoke Test, after generating default host config and test files, valid options are: vmpooler or vagrant.'
   task :run_test, [:hypervisor] => ["beaker_quickstart:gen_hosts", 'beaker_quickstart:gen_pre_suite',
                                      'beaker_quickstart:gen_smoke_test'] do
-  |t, args|
+  |_t, args|
     hypervisor             = args[:hypervisor] ||='vagrant'
     system_args             = Hash.new
     system_args[:hosts]     = "acceptance/config/default_#{hypervisor}_hosts.yaml"

data/lib/beaker/tasks/rake_task.rb

@@ -64,7 +64,7 @@ module Beaker
                                                                                                                                 .application.last_comment)
         task name, *args do |_, task_args|
           RakeFileUtils.__send__(:verbose, verbose) do
-            task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
+            yield(*[self, task_args].slice(0, task_block.arity)) if task_block
             run_task verbose
           end
         end
@@ -75,7 +75,7 @@ module Beaker
       #   if no other options file is provided
       #
       def check_for_beaker_type_config
-        if !@options_file && File.exists?("#{@acceptance_root}/.beaker-#{@type}.cfg")
+        if !@options_file && File.exist?("#{@acceptance_root}/.beaker-#{@type}.cfg")
           @options_file = File.join(@acceptance_root, ".beaker-#{@type}.cfg")
         end
       end
@@ -84,7 +84,7 @@ module Beaker
       # Check for existence of ENV variables for test if !@tests is undef
       #
       def check_env_variables
-        if File.exists?(File.join(DEFAULT_ACCEPTANCE_ROOT, 'tests'))
+        if File.exist?(File.join(DEFAULT_ACCEPTANCE_ROOT, 'tests'))
           @tests = File.join(DEFAULT_ACCEPTANCE_ROOT, 'tests')
         end
         @tests = ENV['TESTS'] || ENV['TEST'] if !@tests

data/lib/beaker/test_suite.rb

@@ -77,10 +77,10 @@ module Beaker
           @logger.warn msg
         when :fail
           @logger.error msg
-          break if @fail_mode.to_s !~ /slow/ #all failure modes except slow cause us to kick out early on failure
+          break if !@fail_mode.to_s.include?('slow') #all failure modes except slow cause us to kick out early on failure
         when :error
           @logger.warn msg
-          break if @fail_mode.to_s !~ /slow/ #all failure modes except slow cause us to kick out early on failure
+          break if !@fail_mode.to_s.include?('slow') #all failure modes except slow cause us to kick out early on failure
         end
       end
       @test_suite_results.stop_time = Time.now

data/lib/beaker/test_suite_result.rb

@@ -18,9 +18,6 @@ module Beaker
       @logger = options[:logger]
       @name = name
       @test_cases = []
-      #Set some defaults, just in case you attempt to print without including them
-      start_time = Time.at(0)
-      stop_time = Time.at(1)
     end
 
     #Add a {TestCase} to this {TestSuiteResult} instance, used in calculating {TestSuiteResult} data.
@@ -36,27 +33,27 @@ module Beaker
 
     #How many passed {TestCase} instances are in this {TestSuiteResult}
     def passed_tests
-      @test_cases.select { |c| c.test_status == :pass }.length
+      @test_cases.count { |c| c.test_status == :pass }
     end
 
     #How many errored {TestCase} instances are in this {TestSuiteResult}
     def errored_tests
-      @test_cases.select { |c| c.test_status == :error }.length
+      @test_cases.count { |c| c.test_status == :error }
     end
 
     #How many failed {TestCase} instances are in this {TestSuiteResult}
     def failed_tests
-      @test_cases.select { |c| c.test_status == :fail }.length
+      @test_cases.count { |c| c.test_status == :fail }
     end
 
     #How many skipped {TestCase} instances are in this {TestSuiteResult}
     def skipped_tests
-      @test_cases.select { |c| c.test_status == :skip }.length
+      @test_cases.count { |c| c.test_status == :skip }
     end
 
     #How many pending {TestCase} instances are in this {TestSuiteResult}
     def pending_tests
-      @test_cases.select {|c| c.test_status == :pending}.length
+      @test_cases.count {|c| c.test_status == :pending}
     end
 
     #How many {TestCase} instances failed in this {TestSuiteResult}
@@ -178,7 +175,7 @@ module Beaker
       stylesheet = File.join(@options[:project_root], @options[:xml_stylesheet])
 
       begin
-        LoggerJunit.write_xml(xml_file, stylesheet) do |doc, suites|
+        LoggerJunit.write_xml(xml_file, stylesheet) do |_doc, suites|
 
           meta_info = suites.add_element(REXML::Element.new('meta_test_info'))
           unless file_to_link.nil?
@@ -229,7 +226,7 @@ module Beaker
               status = item.add_element(REXML::Element.new('failure'))
               status.add_attribute('type', test.test_status.to_s)
               if test.exception
-                status.add_attribute('message', test.exception.to_s.gsub(/\e/,''))
+                status.add_attribute('message', test.exception.to_s.delete("\e"))
                 data = LoggerJunit.format_cdata(test.exception.backtrace.join('\n'))
                 REXML::CData.new(data, true, status)
               end
@@ -259,7 +256,7 @@ module Beaker
           end
         end
       rescue Exception => e
-        @logger.error "failure in XML output: \n#{e.to_s}" + e.backtrace.join("\n")
+        @logger.error "failure in XML output: \n#{e}" + e.backtrace.join("\n")
       end
     end
 

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '4.38.1'
+    STRING = '4.39.0'
   end
 end

data/spec/beaker/cli_spec.rb

@@ -13,9 +13,15 @@ end
 module Beaker
   describe CLI do
 
+    let(:cli)      {
+      allow(File).to receive(:exist?).and_call_original
+      allow(File).to receive(:exist?).with('.beaker.yml').and_return(false)
+      described_class.new.parse_options
+    }
+
     context 'initializing and parsing' do
       let( :cli ) {
-        Beaker::CLI.new
+        described_class.new
       }
 
       describe 'instance variable initialization' do
@@ -32,7 +38,7 @@ module Beaker
 
       describe '#parse_options' do
         it 'returns self' do
-          expect(cli.parse_options).to be_instance_of(Beaker::CLI)
+          expect(cli.parse_options).to be_instance_of(described_class)
         end
 
         it 'replaces the logger object with a new one' do
@@ -67,8 +73,9 @@ module Beaker
         before do
           options  = Beaker::Options::OptionsHash.new
           options[:beaker_version] = 'version_number'
-          cli.instance_variable_set('@options', options)
+          cli.instance_variable_set(:@options, options)
         end
+
         it 'prints the version and dumps the options' do
           expect(cli.logger).to receive(:info).exactly(3).times
           cli.print_version_and_options
@@ -76,13 +83,8 @@ module Beaker
       end
     end
 
-    let(:cli)      {
-      allow(File).to receive(:exists?).and_return(true)
-      allow(File).to receive(:exists?).with('.beaker.yml').and_return(false)
-      Beaker::CLI.new.parse_options
-    }
 
-    context '#configured_options' do
+    describe '#configured_options' do
       it 'returns a list of options that were not presets' do
         attribution = cli.instance_variable_get(:@attribution)
         attribution.each do |attribute, setter|
@@ -94,14 +96,16 @@ module Beaker
     end
 
     describe '#combined_instance_and_options_hosts' do
-      let (:options_host) { {'HOSTS' => {'ubuntu' => {:options_attribute => 'options'}} }}
-      let (:instance_host ) {
+      let(:options_host) { {'HOSTS' => {'ubuntu' => {:options_attribute => 'options'}} }}
+      let(:instance_host ) {
         [Beaker::Host.create('ubuntu', {:platform => 'host'}, {} )]
       }
+
       before do
         cli.instance_variable_set(:@options, options_host)
         cli.instance_variable_set(:@hosts, instance_host)
       end
+
       it 'combines the options and instance host objects' do
         merged_host = cli.combined_instance_and_options_hosts
         expect(merged_host).to have_key('ubuntu')
@@ -112,11 +116,11 @@ module Beaker
       end
 
       context 'when hosts share IP addresses' do
-        let (:options_host) do
+        let(:options_host) do
           {'HOSTS' => {'host1' => {:options_attribute => 'options'},
                        'host2' => {:options_attribute => 'options'}}}
         end
-        let (:instance_host ) do
+        let(:instance_host ) do
           [Beaker::Host.create('host1',
                                {:platform => 'host', :ip => '127.0.0.1'}, {} ),
            Beaker::Host.create('host2',
@@ -133,7 +137,7 @@ module Beaker
     end
 
     context 'execute!' do
-      before :each do
+      before do
        stub_const("Beaker::Logger", double().as_null_object )
         File.open("sample.cfg", "w+") do |file|
           file.write("HOSTS:\n")
@@ -158,7 +162,7 @@ module Beaker
           allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           allow( cli ).to receive(:run_suite).with(:pre_cleanup).and_return(true)
 
-          expect( cli ).to receive(:run_suite).exactly( 2 ).times
+          expect( cli ).to receive(:run_suite).twice
           expect{ cli.execute! }.to raise_error
           expect(cli.instance_variable_get(:@attribution)[:logger]).to be == 'runtime'
           expect(cli.instance_variable_get(:@attribution)[:timestamp]).to be == 'runtime'
@@ -226,7 +230,7 @@ module Beaker
           cli.instance_variable_set(:@network_manager, netmanager)
           expect( netmanager ).to receive(:cleanup).once
 
-          expect{ cli.execute! }.to_not raise_error
+          expect{ cli.execute! }.not_to raise_error
 
         end
 
@@ -246,9 +250,9 @@ module Beaker
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
-          expect( netmanager ).to receive(:cleanup).never
+          expect( netmanager ).not_to receive(:cleanup)
 
-          expect{ cli.execute! }.to_not raise_error
+          expect{ cli.execute! }.not_to raise_error
 
         end
 
@@ -264,7 +268,7 @@ module Beaker
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
-          expect( netmanager ).to receive(:cleanup).never
+          expect( netmanager ).not_to receive(:cleanup)
 
           expect{ cli.execute! }.to raise_error
         end
@@ -283,7 +287,7 @@ module Beaker
           cli.instance_variable_set(:@network_manager, netmanager)
           expect( netmanager ).to receive(:cleanup).once
 
-          expect{ cli.execute! }.to_not raise_error
+          expect{ cli.execute! }.not_to raise_error
 
         end
 
@@ -299,7 +303,7 @@ module Beaker
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
-          expect( netmanager ).to receive(:cleanup).never
+          expect( netmanager ).not_to receive(:cleanup)
 
           expect{ cli.execute! }.to raise_error
 
@@ -338,9 +342,9 @@ module Beaker
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
-          expect( netmanager ).to receive(:cleanup).never
+          expect( netmanager ).not_to receive(:cleanup)
 
-          expect{ cli.execute! }.to_not raise_error
+          expect{ cli.execute! }.not_to raise_error
         end
       end
 
@@ -381,7 +385,7 @@ module Beaker
 
       describe 'hosts file saving when preserve_hosts should happen' do
 
-        before :each do
+        before do
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           options[:preserve_hosts] = 'onpass'
@@ -400,7 +404,7 @@ module Beaker
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
-          expect( netmanager ).to receive(:cleanup).never
+          expect( netmanager ).not_to receive(:cleanup)
 
 
           allow( cli ).to receive( :print_env_vars_affecting_beaker )
@@ -414,7 +418,7 @@ module Beaker
           Dir.mktmpdir do |dir|
             options[:log_dated_dir] = File.absolute_path(dir)
 
-            expect{ cli.execute! }.to_not raise_error
+            expect{ cli.execute! }.not_to raise_error
           end
         end
 
@@ -426,7 +430,7 @@ module Beaker
             cli.execute!
 
             copied_hosts_file = File.join(File.absolute_path(dir), 'hosts_preserved.yml')
-            expect( File.exists?(copied_hosts_file) ).to be_truthy
+            expect( File ).to exist(copied_hosts_file)
           end
         end
 
@@ -438,7 +442,7 @@ module Beaker
             cli.execute!
 
             copied_hosts_file = File.join(File.absolute_path(dir), 'hosts_preserved.yml')
-            expect{ load_yaml_file(copied_hosts_file) }.to_not raise_error
+            expect{ load_yaml_file(copied_hosts_file) }.not_to raise_error
           end
         end
 
@@ -460,9 +464,9 @@ module Beaker
           Dir.mktmpdir do |dir|
             options[:log_dated_dir] = File.absolute_path(dir)
 
-            expect( options.has_key?(:hosts_preserved_yaml_file) ).to be_falsy
+            expect( options ).not_to have_key(:hosts_preserved_yaml_file)
             cli.execute!
-            expect( options.has_key?(:hosts_preserved_yaml_file) ).to be_truthy
+            expect( options ).to have_key(:hosts_preserved_yaml_file)
 
             copied_hosts_file = File.join(File.absolute_path(dir), 'hosts_preserved.yml')
             expect( options[:hosts_preserved_yaml_file] ).to be === copied_hosts_file
@@ -478,9 +482,9 @@ module Beaker
               copied_hosts_file = File.join(File.absolute_path(dir), options[:hosts_file])
 
               logger = cli.instance_variable_get(:@logger)
-              expect( logger ).to receive( :send ).with( anything, "\nYou can re-run commands against the already provisioned SUT(s) by following these steps:\n").never
-              expect( logger ).to receive( :send ).with( anything, "- change the hosts file to #{copied_hosts_file}").never
-              expect( logger ).to receive( :send ).with( anything, '- use the --no-provision flag').never
+              expect( logger ).not_to receive( :send ).with( anything, "\nYou can re-run commands against the already provisioned SUT(s) by following these steps:\n")
+              expect( logger ).not_to receive( :send ).with( anything, "- change the hosts file to #{copied_hosts_file}")
+              expect( logger ).not_to receive( :send ).with( anything, '- use the --no-provision flag')
 
               cli.execute!
             end
@@ -490,7 +494,6 @@ module Beaker
             options = cli.instance_variable_get(:@options)
             Dir.mktmpdir do |dir|
               options[:log_dated_dir] = File.absolute_path(dir)
-              copied_hosts_file = File.join(File.absolute_path(dir), options[:hosts_file])
 
               hosts = cli.instance_variable_get(:@hosts)
               hosts << make_host('fusion', { :hypervisor => 'fusion' })
@@ -510,7 +513,6 @@ module Beaker
             options = cli.instance_variable_get(:@options)
             Dir.mktmpdir do |dir|
               options[:log_dated_dir] = File.absolute_path(dir)
-              copied_hosts_file = File.join(File.absolute_path(dir), options[:hosts_file])
 
               hosts = cli.instance_variable_get(:@hosts)
               hosts << make_host('fusion', { :hypervisor => 'fusion' })
@@ -538,10 +540,10 @@ module Beaker
               hosts << make_host('docker', { :hypervisor => 'docker' })
 
               logger = cli.instance_variable_get(:@logger)
-              expect( logger ).to receive( :send ).with( anything, "\nYou can re-run commands against the already provisioned SUT(s) with:\n").never
-              expect( logger ).to receive( :send ).with( anything, '(docker support is untested for this feature. please reference the docs for more info)').never
-              expect( logger ).to receive( :send ).with( anything, "- change the hosts file to #{copied_hosts_file}").never
-              expect( logger ).to receive( :send ).with( anything, '- use the --no-provision flag').never
+              expect( logger ).not_to receive( :send ).with( anything, "\nYou can re-run commands against the already provisioned SUT(s) with:\n")
+              expect( logger ).not_to receive( :send ).with( anything, '(docker support is untested for this feature. please reference the docs for more info)')
+              expect( logger ).not_to receive( :send ).with( anything, "- change the hosts file to #{copied_hosts_file}")
+              expect( logger ).not_to receive( :send ).with( anything, '- use the --no-provision flag')
 
               cli.execute!
             end
@@ -550,6 +552,7 @@ module Beaker
 
         end
       end
+
       describe '#build_hosts_preserved_reproducing_command' do
 
         it 'replaces the hosts file' do
@@ -558,7 +561,7 @@ module Beaker
           command_correct = "p --log-level debug --hosts #{new_hosts_file} jam --jankies --flag-business"
 
           answer = cli.build_hosts_preserved_reproducing_command(command_to_sub, new_hosts_file)
-          expect( answer.start_with?(command_correct) ).to be_truthy
+          expect( answer ).to be_start_with(command_correct)
         end
 
         it 'doesn\'t replace an entry if no --hosts key is found' do
@@ -566,7 +569,7 @@ module Beaker
           command_correct = 'p --log-level debug johnnypantaloons7 --jankies --flag-business'
 
           answer = cli.build_hosts_preserved_reproducing_command(command_to_sub, 'john/deer/plans.txt')
-          expect( answer.start_with?(command_correct) ).to be_truthy
+          expect( answer ).to be_start_with(command_correct)
         end
 
         it 'removes any old --provision flags' do
@@ -574,7 +577,7 @@ module Beaker
           command_correct = 'jam --jankies --flag-business'
 
           answer = cli.build_hosts_preserved_reproducing_command(command_to_sub, 'can/talk/to/pigs.yml')
-          expect( answer.start_with?(command_correct) ).to be_truthy
+          expect( answer ).to be_start_with(command_correct)
         end
 
         it 'removes any old --no-provision flags' do
@@ -582,7 +585,7 @@ module Beaker
           command_correct = 'jam --jankoos --flag-businesses'
 
           answer = cli.build_hosts_preserved_reproducing_command(command_to_sub, 'can/talk/to/bears.yml')
-          expect( answer.start_with?(command_correct) ).to be_truthy
+          expect( answer ).to be_start_with(command_correct)
         end
       end