beaker 4.38.1 → 4.39.0

data/spec/beaker/dsl/test_tagging_spec.rb

@@ -8,18 +8,18 @@ end
 describe ClassMixedWithDSLStructure do
   include Beaker::DSL::Assertions
 
-  let (:logger) { double }
-  let (:metadata) { @metadata ||= {} }
+  let(:logger) { double }
+  let(:metadata) { @metadata ||= {} }
 
-  before :each do
+  before do
     allow( subject ).to receive(:metadata).and_return(metadata)
   end
 
   describe '#tag' do
-    let ( :test_tag_and     ) { @test_tag_and     || [] }
-    let ( :test_tag_or      ) { @test_tag_or      || [] }
-    let ( :test_tag_exclude ) { @test_tag_exclude || [] }
-    let ( :options          ) {
+    let( :test_tag_and     ) { @test_tag_and     || [] }
+    let( :test_tag_or      ) { @test_tag_or      || [] }
+    let( :test_tag_exclude ) { @test_tag_exclude || [] }
+    let( :options          ) {
       opts                    = Beaker::Options::OptionsHash.new
       opts[:test_tag_and]     = test_tag_and
       opts[:test_tag_or]      = test_tag_or
@@ -27,7 +27,7 @@ describe ClassMixedWithDSLStructure do
       opts
     }
 
-    before :each do
+    before do
       allow( subject ).to receive( :platform_specific_tag_confines )
     end
 
@@ -62,7 +62,7 @@ describe ClassMixedWithDSLStructure do
       subject.instance_variable_set(:@options, options)
 
       allow( subject ).to receive( :path )
-      expect( subject ).to receive( :skip_test ).never
+      expect( subject ).not_to receive( :skip_test )
       subject.tag(*test_tags)
     end
 
@@ -93,7 +93,7 @@ describe ClassMixedWithDSLStructure do
       subject.instance_variable_set(:@options, options)
 
       allow( subject ).to receive( :path )
-      expect( subject ).to receive( :skip_test ).never
+      expect( subject ).not_to receive( :skip_test )
       subject.tag(*test_tags)
     end
 
@@ -113,7 +113,7 @@ describe ClassMixedWithDSLStructure do
       subject.instance_variable_set(:@options, options)
 
       allow( subject ).to receive( :path )
-      expect( subject ).to receive( :skip_test ).never
+      expect( subject ).not_to receive( :skip_test )
       subject.tag(*test_tags)
     end
 
@@ -131,9 +131,9 @@ describe ClassMixedWithDSLStructure do
 end
 
 describe Beaker::DSL::TestTagging::PlatformTagConfiner do
-  let ( :confines_array ) { @confines_array || [] }
-  let ( :confiner ) {
-    Beaker::DSL::TestTagging::PlatformTagConfiner.new( confines_array )
+  let( :confines_array ) { @confines_array || [] }
+  let( :confiner ) {
+    described_class.new( confines_array )
   }
 
   describe '#initialize' do
@@ -240,7 +240,7 @@ describe Beaker::DSL::TestTagging::PlatformTagConfiner do
       key_combos_to_test << [ 'tag2', 'tag3', 'tag4' ]
       key_combos_to_test << fake_confine_details_hash.keys()
 
-      before :each do
+      before do
         confiner.instance_variable_set(
           :@tag_confine_details_hash, fake_confine_details_hash
         )
@@ -262,7 +262,7 @@ describe Beaker::DSL::TestTagging::PlatformTagConfiner do
 
           details = confiner.confine_details( key_combo_to_have )
           have_nots.each do |confine_details|
-            expect( details ).to_not include( confine_details )
+            expect( details ).not_to include( confine_details )
           end
           haves.each do |confine_details|
             expect( details ).to     include( confine_details )

data/spec/beaker/dsl/wrappers_spec.rb

@@ -13,21 +13,21 @@ describe ClassMixedWithDSLWrappers do
   end
 
   describe '#powershell' do
-    it 'should pass "powershell.exe <args> -Command <command>" to Command' do
+    it 'passes "powershell.exe <args> -Command <command>" to Command' do
       command = subject.powershell("Set-Content -path 'fu.txt' -value 'fu'")
       expect(command.command ).to be === 'powershell.exe'
       expect( command.args).to be ===  ["-ExecutionPolicy Bypass", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command Set-Content -path 'fu.txt' -value 'fu'"]
       expect( command.options ).to be === {}
     end
 
-    it 'should merge the arguments provided with the defaults' do
+    it 'merges the arguments provided with the defaults' do
       command = subject.powershell("Set-Content -path 'fu.txt' -value 'fu'", {'ExecutionPolicy' => 'Unrestricted'})
       expect( command.command).to be === 'powershell.exe'
       expect( command.args ).to be === ["-ExecutionPolicy Unrestricted", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command Set-Content -path 'fu.txt' -value 'fu'"]
       expect( command.options ).to be === {}
     end
 
-    it 'should use EncodedCommand when EncodedCommand => true' do
+    it 'uses EncodedCommand when EncodedCommand => true' do
       cmd = "Set-Content -path 'fu.txt' -value 'fu'"
       cmd = subject.encode_command(cmd)
       command = subject.powershell("Set-Content -path 'fu.txt' -value 'fu'", {'EncodedCommand' => true})
@@ -36,7 +36,7 @@ describe ClassMixedWithDSLWrappers do
       expect( command.options ).to be === {}
     end
 
-    it 'should use EncodedCommand when EncodedCommand => ""' do
+    it 'uses EncodedCommand when EncodedCommand => ""' do
       cmd = "Set-Content -path 'fu.txt' -value 'fu'"
       cmd = subject.encode_command(cmd)
       command = subject.powershell("Set-Content -path 'fu.txt' -value 'fu'", {'EncodedCommand' => ""})
@@ -45,7 +45,7 @@ describe ClassMixedWithDSLWrappers do
       expect( command.options ).to be === {}
     end
 
-    it 'should use EncodedCommand when EncodedCommand => nil' do
+    it 'uses EncodedCommand when EncodedCommand => nil' do
       cmd = "Set-Content -path 'fu.txt' -value 'fu'"
       cmd = subject.encode_command(cmd)
       command = subject.powershell("Set-Content -path 'fu.txt' -value 'fu'", {'EncodedCommand' => nil})
@@ -54,14 +54,14 @@ describe ClassMixedWithDSLWrappers do
       expect( command.options ).to be === {}
     end
 
-    it 'should not use EncodedCommand when EncodedCommand => false' do
+    it 'does not use EncodedCommand when EncodedCommand => false' do
       command = subject.powershell("Set-Content -path 'fu.txt' -value 'fu'", {'EncodedCommand' => false})
       expect(command.command ).to be === 'powershell.exe'
       expect( command.args).to be ===  ["-ExecutionPolicy Bypass", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command Set-Content -path 'fu.txt' -value 'fu'"]
       expect( command.options ).to be === {}
     end
 
-    it 'should not use EncodedCommand when EncodedCommand not present' do
+    it 'does not use EncodedCommand when EncodedCommand not present' do
       command = subject.powershell("Set-Content -path 'fu.txt' -value 'fu'", {})
       expect(command.command ).to be === 'powershell.exe'
       expect( command.args).to be ===  ["-ExecutionPolicy Bypass", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command Set-Content -path 'fu.txt' -value 'fu'"]

data/spec/beaker/host/cisco_spec.rb

@@ -18,7 +18,7 @@ module Cisco
 
       context 'for cisco_nexus-7' do
 
-        before :each do
+        before do
           @platform = 'cisco_nexus-7-x86_64'
         end
 
@@ -71,7 +71,7 @@ module Cisco
 
       context 'for cisco_ios_xr-6' do
 
-        before :each do
+        before do
           @platform = 'cisco_ios_xr-6-x86_64'
         end
 
@@ -111,7 +111,7 @@ module Cisco
 
       context 'for cisco_nexus-7' do
 
-        before :each do
+        before do
           @platform = 'cisco_nexus-7-x86_64'
           @options = { :user => 'non_root' }
         end
@@ -150,7 +150,7 @@ module Cisco
 
       context 'for cisco_ios_xr-6' do
 
-        before :each do
+        before do
           @platform = 'cisco_ios_xr-6-x86_64'
           @options = { :user => 'non_root' }
         end
@@ -192,7 +192,7 @@ module Cisco
 
       context 'for cisco_nexus-7' do
 
-        before :each do
+        before do
           @platform = 'cisco_nexus-7-x86_64'
         end
 
@@ -220,7 +220,7 @@ module Cisco
       end
 
       context 'for cisco_ios_xr-6' do
-        before :each do
+        before do
           @platform = 'cisco_ios_xr-6-x86_64'
         end
 
@@ -275,7 +275,7 @@ module Cisco
     describe '#validate_setup' do
 
       context 'on the cisco_nexus-7 platform' do
-        before :each do
+        before do
           @platform = 'cisco_nexus-7-x86_64'
         end
 
@@ -306,7 +306,7 @@ module Cisco
       end
 
       context 'on the cisco_ios_xr-6 platform' do
-        before :each do
+        before do
           @platform = 'cisco_ios_xr-6-x86_64'
         end
 

data/spec/beaker/host/freebsd/exec_spec.rb

@@ -19,9 +19,9 @@ module Beaker
       end
     end
 
-    let (:opts)     { @opts || {} }
-    let (:logger)   { double( 'logger' ).as_null_object }
-    let (:instance) { FreeBSDExecTest.new(opts, logger) }
+    let(:opts)     { @opts || {} }
+    let(:logger)   { double( 'logger' ).as_null_object }
+    let(:instance) { FreeBSDExecTest.new(opts, logger) }
 
     context "echo_to_file" do
 

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

@@ -24,9 +24,9 @@ module Beaker
 
     end
 
-    let (:opts)     { @opts || {} }
-    let (:logger)   { double( 'logger' ).as_null_object }
-    let (:instance) { FreeBSDPkgTest.new(opts, logger) }
+    let(:opts)     { @opts || {} }
+    let(:logger)   { double( 'logger' ).as_null_object }
+    let(:instance) { FreeBSDPkgTest.new(opts, logger) }
     let(:cond) do
       'TMPDIR=/dev/null ASSUME_ALWAYS_YES=1 PACKAGESITE=file:///nonexist pkg info -x "pkg(-devel)?\\$" > /dev/null 2>&1'
     end
@@ -48,6 +48,7 @@ module Beaker
         expect( instance ).to receive(:exec).with('',{:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.pkgng_active? ).to be true
       end
+
       it "returns false if pkgng is unavailable" do
         expect( instance ).to receive(:check_pkgng_sh).once.and_return("do you have pkgng?")
         expect( Beaker::Command ).to receive(:new).with("/bin/sh -c 'do you have pkgng?'", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
@@ -65,6 +66,7 @@ module Beaker
           instance.install_package('rsync')
         end
       end
+
       context "with pkgng" do
         it "runs the correct install command" do
           expect( instance ).to receive(:pkgng_active?).once.and_return(true)
@@ -84,6 +86,7 @@ module Beaker
           instance.check_for_package('rsync')
         end
       end
+
       context "with pkgng" do
         it "runs the correct checking command" do
           expect( instance ).to receive(:pkgng_active?).once.and_return(true)

data/spec/beaker/host/mac/exec_spec.rb

@@ -20,9 +20,9 @@ module Beaker
 
     end
 
-    let (:opts)     { @opts || {} }
-    let (:logger)   { double( 'logger' ).as_null_object }
-    let (:instance) { MacExecTest.new(opts, logger) }
+    let(:opts)     { @opts || {} }
+    let(:logger)   { double( 'logger' ).as_null_object }
+    let(:instance) { MacExecTest.new(opts, logger) }
 
     describe '#selinux_enabled?' do
       it 'does not call selinuxenabled' do

data/spec/beaker/host/mac_spec.rb

@@ -26,28 +26,28 @@ module Mac
       end
 
       it 'returns two strings that include the passed parameters' do
-        allow( host ).to receive( :link_exists? ) { true }
+        allow( host ).to receive( :link_exists? ).and_return(true)
         return1, return2 = host.puppet_agent_dev_package_info( 'pc1', 'pav1', :download_url => '' )
         expect( return1 ).to match( /pc1/ )
         expect( return2 ).to match( /pav1/ )
       end
 
       it 'gets the correct file type' do
-        allow( host ).to receive( :link_exists? ) { true }
+        allow( host ).to receive( :link_exists? ).and_return(true)
         _, return2 = host.puppet_agent_dev_package_info( 'pc2', 'pav2', :download_url => '' )
         expect( return2 ).to match( /\.dmg$/ )
       end
 
       it 'adds the version dot correctly if not supplied' do
         @platform = 'osx-10.12-x86_64'
-        allow( host ).to receive( :link_exists? ) { true }
+        allow( host ).to receive( :link_exists? ).and_return(true)
         release_path_end, release_file = host.puppet_agent_dev_package_info( 'PC3', 'pav3', :download_url => '' )
         expect( release_path_end ).to match( /10\.12/ )
         expect( release_file ).to match( /10\.12/ )
       end
 
       it 'runs the correct install for osx platforms (newest link format)' do
-        allow( host ).to receive( :link_exists? ) { true }
+        allow( host ).to receive( :link_exists? ).and_return(true)
 
         release_path_end, release_file = host.puppet_agent_dev_package_info( 'PC4', 'pav4', :download_url => '' )
         # verify the mac package name starts the name correctly
@@ -71,7 +71,7 @@ module Mac
       end
 
       it 'runs the correct install for osx platforms (old link format)' do
-        allow( host ).to receive( :link_exists? ) { false }
+        allow( host ).to receive( :link_exists? ).and_return(false)
 
         release_path_end, release_file = host.puppet_agent_dev_package_info( 'PC8', 'pav8', :download_url => '' )
         # verify the mac package name starts the name correctly
@@ -84,7 +84,7 @@ module Mac
     end
 
     describe '#pe_puppet_agent_promoted_package_info' do
-      before :each do
+      before do
         @platform = "osx-10.15-x86_64"
       end
 

data/spec/beaker/host/pswindows/exec_spec.rb

@@ -20,9 +20,9 @@ module Beaker
 
     end
 
-    let (:opts)     { @opts || {} }
-    let (:logger)   { double( 'logger' ).as_null_object }
-    let (:instance) { PSWindowsExecTest.new(opts, logger) }
+    let(:opts)     { @opts || {} }
+    let(:logger)   { double( 'logger' ).as_null_object }
+    let(:instance) { PSWindowsExecTest.new(opts, logger) }
 
     context "rm" do
 
@@ -40,12 +40,12 @@ module Beaker
 
       it 'rm first' do
         expect(instance).to receive(:execute).with("del /s /q \"\\destination\\path\\of\\content\"").and_return(0)
-        expect(instance).to receive(:execute).with("move /y #{origin.gsub(/\//, '\\')} #{destination.gsub(/\//, '\\')}").and_return(0)
+        expect(instance).to receive(:execute).with("move /y #{origin.tr('/', '\\')} #{destination.tr('/', '\\')}").and_return(0)
         expect(instance.mv(origin, destination)).to eq(0)
       end
 
       it 'does not rm' do
-        expect( instance ).to receive(:execute).with("move /y #{origin.gsub(/\//, '\\')} #{destination.gsub(/\//, '\\')}").and_return(0)
+        expect( instance ).to receive(:execute).with("move /y #{origin.tr('/', '\\')} #{destination.tr('/', '\\')}").and_return(0)
         expect( instance.mv(origin, destination, false) ).to be === 0
       end
     end
@@ -57,6 +57,7 @@ module Beaker
 
       context 'file exists' do
         let(:stdout) { 'True' }
+
         it 'sets the modified_at date' do
           file = 'C:\path\to\file'
           expect(instance).to receive(:execute).with("powershell Test-Path #{file} -PathType Leaf")
@@ -69,6 +70,7 @@ module Beaker
 
       context 'file does not exist' do
         let(:stdout) { 'False' }
+
         it 'creates it and sets the modified_at date' do
           file = 'C:\path\to\file'
           expect(instance).to receive(:execute).with("powershell Test-Path #{file} -PathType Leaf")
@@ -104,6 +106,7 @@ module Beaker
         allow(instance).to receive(:execute)
                                .with(where_command, :accept_all_exit_codes => true).and_return(result)
       end
+
       let(:where_command) { "cmd /C \"where ruby\"" }
 
       context 'when only the environment variable PATH is used' do

data/spec/beaker/host/pswindows/file_spec.rb

@@ -20,13 +20,14 @@ module Beaker
       end
     end
 
-    let (:opts)     { @opts || {} }
-    let (:logger)   { double( 'logger' ).as_null_object }
-    let (:instance) { PSWindowsFileTest.new(opts, logger) }
+    let(:opts)     { @opts || {} }
+    let(:logger)   { double( 'logger' ).as_null_object }
+    let(:instance) { PSWindowsFileTest.new(opts, logger) }
 
     describe '#cat' do
       let(:path) { '/path/to/cat' }
       let(:content) { 'file content' }
+
       it 'reads output for file' do
         expect(instance).to receive(:exec).and_return(double(stdout: content))
         expect(Beaker::Command).to receive(:new).with('powershell.exe', array_including("-Command type #{path}"))
@@ -36,6 +37,7 @@ module Beaker
 
     describe '#file_exist?' do
       let(:path) { '/path/to/test/file.txt' }
+
       context 'file exists' do
         it 'returns true' do
           expect(instance).to receive(:exec).and_return(double(stdout: "true\n"))
@@ -63,6 +65,7 @@ module Beaker
 
       context 'with dirname sent' do
         let(:name) { 'my_dir' }
+
         it 'returns the path to my_dir' do
           expect(Beaker::Command).to receive(:new).
             with('powershell.exe', array_including('-Command [System.IO.Path]::GetTempPath()')).

data/spec/beaker/host/pswindows_spec.rb

@@ -12,7 +12,7 @@ module PSWindows
     }
     let(:host)    {
       opts = options.merge(platform)
-      opts.merge!({ :is_cygwin => false })
+      opts[:is_cygwin] = false
       make_host( 'name', opts )
     }
 

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

@@ -21,9 +21,9 @@ module Beaker
 
     end
 
-    let (:opts)     { @opts || {} }
-    let (:logger)   { double( 'logger' ).as_null_object }
-    let (:instance) { UnixExecTest.new(opts, logger) }
+    let(:opts)     { @opts || {} }
+    let(:logger)   { double( 'logger' ).as_null_object }
+    let(:instance) { UnixExecTest.new(opts, logger) }
 
     context "rm" do
 
@@ -65,7 +65,7 @@ module Beaker
       let(:host) { {'pathseparator' => ':'} }
 
       it 'returns a blank string if theres no env' do
-        expect( instance ).to receive( :is_powershell? ).never
+        expect( instance ).not_to receive( :is_powershell? )
         expect( instance.environment_string( {} ) ).to be == ''
       end
 
@@ -82,9 +82,9 @@ module Beaker
 
     describe '#ssh_permit_user_environment' do
       context 'When called without error' do
-        let (:directory) {'/directory'}
-        let (:ssh_command) {"echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"}
-        let (:ssh_move) {"mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"}
+        let(:directory) {'/directory'}
+        let(:ssh_command) {"echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"}
+        let(:ssh_move) {"mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"}
 
         platforms = PlatformHelpers::SYSTEMDPLATFORMS + PlatformHelpers::DEBIANPLATFORMS + PlatformHelpers::SYSTEMVPLATFORMS
 
@@ -96,7 +96,7 @@ module Beaker
             expect(Beaker::Command).to receive(:new).with(ssh_move)
             expect(Beaker::Command).to receive(:new).with(ssh_command)
             expect(instance).to receive(:ssh_service_restart)
-            expect{instance.ssh_permit_user_environment}.to_not raise_error
+            expect{instance.ssh_permit_user_environment}.not_to raise_error
           end
         end
       end
@@ -115,7 +115,7 @@ module Beaker
           opts['platform'] = platform
           expect(instance).to receive(:exec)
           expect(Beaker::Command).to receive(:new).with("systemctl restart sshd.service")
-          expect{instance.ssh_service_restart}.to_not raise_error
+          expect{instance.ssh_service_restart}.not_to raise_error
         end
       end
 
@@ -124,7 +124,7 @@ module Beaker
           opts['platform'] = platform
           expect(instance).to receive(:exec)
           expect(Beaker::Command).to receive(:new).with("service ssh restart")
-          expect{instance.ssh_service_restart}.to_not raise_error
+          expect{instance.ssh_service_restart}.not_to raise_error
         end
       end
 
@@ -133,7 +133,7 @@ module Beaker
           opts['platform'] = "#{platform}-arch"
           expect(instance).to receive(:exec)
           expect(Beaker::Command).to receive(:new).with("/sbin/service sshd restart")
-          expect{instance.ssh_service_restart}.to_not raise_error
+          expect{instance.ssh_service_restart}.not_to raise_error
         end
       end
 
@@ -230,13 +230,13 @@ module Beaker
       }
 
       # no-op response
-      let (:response) { double( 'response' ) }
-      let (:boot_time_initial_response) { double( 'response' ) }
+      let(:response) { double( 'response' ) }
+      let(:boot_time_initial_response) { double( 'response' ) }
 
-      let (:boot_time_success_response) { double( 'response' ) }
-      let (:sleep_time) { 10 }
+      let(:boot_time_success_response) { double( 'response' ) }
+      let(:sleep_time) { 10 }
 
-      before :each do
+      before do
         # stubs enough to survive the first boot_time call & output parsing
         #   note: just stubs input-chain between calls, parsing methods still run
         allow(Beaker::Command).to receive(:new).with('last -F reboot || who -b').and_return(:boot_time_command_stub)
@@ -253,8 +253,8 @@ module Beaker
         check_cmd_output.each do |check_os, cmd_opts|
           cmd_opts.each do |cmd_name, cmd_outputs|
             context "on '#{check_os}' with the '#{cmd_name}' command" do
-              let (:boot_time_initial_stdout) { cmd_outputs[:initial] }
-              let (:boot_time_success_stdout) { cmd_outputs[:success] }
+              let(:boot_time_initial_stdout) { cmd_outputs[:initial] }
+              let(:boot_time_success_stdout) { cmd_outputs[:success] }
 
               it 'passes with defaults' do
                 expect(instance).to receive(:sleep).with(sleep_time)
@@ -290,7 +290,7 @@ module Beaker
               end
 
               context 'command errors' do
-                before :each do
+                before do
                   allow(instance).to receive( :exec ).with(:boot_time_command_stub, anything).and_return(boot_time_initial_response).at_least(:once)
                 end
 
@@ -310,7 +310,7 @@ module Beaker
 
                 context 'incorrect time string' do
                   context 'original time' do
-                    let (:boot_time_initial_stdout) { 'boot bad' }
+                    let(:boot_time_initial_stdout) { 'boot bad' }
 
                     it 'raises a reboot failure' do
                       # Handle the 'retry'
@@ -323,7 +323,7 @@ module Beaker
                   end
 
                   context 'current time' do
-                    let (:boot_time_success_stdout) { 'boot bad' }
+                    let(:boot_time_success_stdout) { 'boot bad' }
 
                     it 'raises a reboot failure' do
                       expect(instance).to receive(:exec).with(:shutdown_command_stub, anything).and_return(response).once
@@ -345,8 +345,8 @@ module Beaker
         check_cmd_output.each do |check_os, cmd_opts|
           cmd_opts.each do |cmd_name, cmd_outputs|
             context "on '#{check_os}' with the '#{cmd_name}' command" do
-              let (:boot_time_initial_stdout) { cmd_outputs[:initial] }
-              let (:boot_time_success_stdout) { cmd_outputs[:initial] }
+              let(:boot_time_initial_stdout) { cmd_outputs[:initial] }
+              let(:boot_time_success_stdout) { cmd_outputs[:initial] }
 
               it 'raises RebootFailure' do
                 expect(instance).to receive(:sleep).with(sleep_time)
@@ -366,7 +366,7 @@ module Beaker
                 expect(instance).to receive( :exec ).with(:boot_time_command_stub, anything).and_return(boot_time_initial_response).once
                 expect(instance).to receive( :exec ).with(:boot_time_command_stub, anything).and_return(boot_time_success_response).once
 
-                expect { instance.reboot(wait_time=sleep_time, max_connection_tries=9, boot_time_retries=10) }.to raise_error(Beaker::Host::RebootFailure, /Boot time did not reset/)
+                expect { instance.reboot(sleep_time, 9, 10) }.to raise_error(Beaker::Host::RebootFailure, /Boot time did not reset/)
               end
             end
           end