beaker 4.41.2 → 5.0.0

data/acceptance/tests/base/dsl/helpers/host_helpers/backup_the_file_test.rb

@@ -3,14 +3,14 @@ require "helpers/test_helper"
 test_name "dsl::helpers::host_helpers #backup_the_file" do
   step "#backup_the_file CURRENTLY will return nil if the file does not exist in the source directory" do
     # NOTE: would expect this to fail with Beaker::Host::CommandFailure
-    remote_source = default.tmpdir()
-    remote_destination = default.tmpdir()
+    remote_source = default.tmpdir
+    remote_destination = default.tmpdir
     result = backup_the_file default, remote_source, remote_destination
     assert_nil result
   end
 
   step "#backup_the_file will fail if the destination directory does not exist" do
-    remote_source = default.tmpdir()
+    remote_source = default.tmpdir
     create_remote_file_from_fixture("simple_text_file", default, remote_source, "puppet.conf")
 
     assert_raises Beaker::Host::CommandFailure do
@@ -19,10 +19,10 @@ test_name "dsl::helpers::host_helpers #backup_the_file" do
   end
 
   step "#backup_the_file copies `puppet.conf` from the source to the destination directory" do
-    remote_source = default.tmpdir()
+    remote_source = default.tmpdir
     _remote_filename, contents = create_remote_file_from_fixture("simple_text_file", default, remote_source, "puppet.conf")
 
-    remote_destination = default.tmpdir()
+    remote_destination = default.tmpdir
     remote_destination_filename = File.join(remote_destination, "puppet.conf.bak")
 
     result = backup_the_file default, remote_source, remote_destination
@@ -33,10 +33,10 @@ test_name "dsl::helpers::host_helpers #backup_the_file" do
   end
 
   step "#backup_the_file copies a named file from the source to the destination directory" do
-    remote_source = default.tmpdir()
+    remote_source = default.tmpdir
     _remote_filename, contents = create_remote_file_from_fixture("simple_text_file", default, remote_source, "testfile.txt")
 
-    remote_destination = default.tmpdir()
+    remote_destination = default.tmpdir
     remote_destination_filename = File.join(remote_destination, "testfile.txt.bak")
 
     result = backup_the_file default, remote_source, remote_destination, "testfile.txt"
@@ -47,9 +47,9 @@ test_name "dsl::helpers::host_helpers #backup_the_file" do
   end
 
   step "#backup_the_file CURRENTLY will fail if given a hosts array" do
-    remote_source = default.tmpdir()
+    remote_source = default.tmpdir
     create_remote_file_from_fixture("simple_text_file", default, remote_source, "testfile.txt")
-    remote_destination = default.tmpdir()
+    remote_destination = default.tmpdir
 
     assert_raises NoMethodError do
       backup_the_file hosts, remote_source, remote_destination

data/acceptance/tests/base/dsl/helpers/host_helpers/check_for_package_test.rb

@@ -15,10 +15,8 @@ def known_installed_package
 end
 
 test_name "dsl::helpers::host_helpers #check_for_package" do
-
   # NOTE: there does not appear to be a way to confine just to cygwin hosts
   confine_block :to, :platform => /windows/ do
-
     # NOTE: check_for_package on windows currently fails as follows:
     #
     #       ArgumentError: wrong number of arguments (3 for 1..2)
@@ -43,7 +41,6 @@ test_name "dsl::helpers::host_helpers #check_for_package" do
   end
 
   confine_block :to, :platform => /solaris/ do
-
     step "#check_for_package will return false if the specified package is not installed on the remote host" do
       result = check_for_package default, "non-existent-package-name"
       assert !result
@@ -70,7 +67,6 @@ test_name "dsl::helpers::host_helpers #check_for_package" do
   end
 
   confine_block :except, :platform => /windows|solaris|osx/ do
-
     step "#check_for_package will return false if the specified package is not installed on the remote host" do
       result = check_for_package default, "non-existent-package-name"
       assert !result

data/acceptance/tests/base/dsl/helpers/host_helpers/create_remote_file_test.rb

@@ -1,23 +1,16 @@
 require "helpers/test_helper"
 
 test_name "dsl::helpers::host_helpers #create_remote_file" do
-
-  def create_remote_file_with_backups host, remote_filename, contents, opts={}
+  def create_remote_file_with_backups host, remote_filename, contents, opts = {}
     result = nil
     repeat_fibonacci_style_for(10) do
       begin
         result = create_remote_file(
           host, remote_filename, contents, opts
         ) # return of block is whether or not we're done repeating
-        if result.is_a?(Rsync::Result) || result.is_a?(Beaker::Result)
-          return result.success?
-        end
+        return result.success? if result.is_a?(Rsync::Result) || result.is_a?(Beaker::Result)
 
-        result.each do |individual_result| 
-          next if individual_result.success?
-          return false
-        end
-        true
+        result.all? { |individual_result| individual_result.success? }
       rescue Beaker::Host::CommandFailure => e
         logger.info("create_remote_file threw command failure, details: ")
         logger.info("  #{e}")
@@ -102,13 +95,15 @@ test_name "dsl::helpers::host_helpers #create_remote_file" do
     end
   end
 
-
   confine_block :except, :platform => /windows/ do
     # these tests exercise the rsync backend
     # NOTE: rsync works fine on Windows as long as you use POSIX-style paths.
     # However, these tests use Host#tmpdir which outputs mixed-style paths
     # e.g. C:/cygwin64/tmp/beaker.Rp9G6L - Fix me with BKR-1503
 
+    # rsync is broken on beaker-docker
+    confine :except, :hypervisor => 'docker'
+
     confine_block :except, :platform => /osx/ do
       # packages are unsupported on OSX
       step "installing rsync on hosts if needed" do
@@ -138,19 +133,18 @@ test_name "dsl::helpers::host_helpers #create_remote_file" do
       remote_filename = File.join(remote_tmpdir, "testfile.txt")
       contents = fixture_contents("simple_text_file")
 
-      create_remote_file_with_backups(
+      result = create_remote_file_with_backups(
         default, remote_filename, contents, { :protocol => "rsync" }
       )
 
       fails_intermittently("https://tickets.puppetlabs.com/browse/BKR-612",
-        "default" => default,
-        "remote_tmpdir" => remote_tmpdir,
-        "remote_filename" => remote_filename,
-        "contents" => contents,
-        "result" => result
-        ) do
-          remote_contents = on(default, "cat #{remote_filename}").stdout
-          assert_equal contents, remote_contents
+                           "default" => default,
+                           "remote_tmpdir" => remote_tmpdir,
+                           "remote_filename" => remote_filename,
+                           "contents" => contents,
+                           "result" => result) do
+        remote_contents = on(default, "cat #{remote_filename}").stdout
+        assert_equal contents, remote_contents
       end
     end
 
@@ -171,12 +165,11 @@ test_name "dsl::helpers::host_helpers #create_remote_file" do
 
       hosts.each do |host|
         fails_intermittently("https://tickets.puppetlabs.com/browse/BKR-612",
-          "host" => host,
-          "remote_tmpdir" => remote_tmpdir,
-          "remote_filename" => remote_filename,
-          "contents" => contents,
-          "result" => result
-          ) do
+                             "host" => host,
+                             "remote_tmpdir" => remote_tmpdir,
+                             "remote_filename" => remote_filename,
+                             "contents" => contents,
+                             "result" => result) do
           remote_contents = on(host, "cat #{remote_filename}").stdout
           assert_equal contents, remote_contents
         end

data/acceptance/tests/base/dsl/helpers/host_helpers/curl_on_test.rb

@@ -17,7 +17,7 @@ test_name "dsl::helpers::host_helpers #curl_on" do
   end
 
   step "#curl_on can retrieve the contents of a URL, using standard curl options" do
-    remote_tmpdir = default.tmpdir()
+    remote_tmpdir = default.tmpdir
     remote_filename, contents = create_remote_file_from_fixture("simple_text_file", default, remote_tmpdir, "testfile.txt")
     remote_targetfilename = File.join remote_tmpdir, "outfile.txt"
 
@@ -29,7 +29,7 @@ test_name "dsl::helpers::host_helpers #curl_on" do
   end
 
   step "#curl_on can retrieve the contents of a URL, when given a hosts array" do
-    remote_tmpdir = default.tmpdir()
+    remote_tmpdir = default.tmpdir
     on hosts, "mkdir -p #{remote_tmpdir}"
 
     remote_filename = contents = nil

data/acceptance/tests/base/dsl/helpers/host_helpers/curl_with_retries_test.rb

@@ -1,7 +1,6 @@
 require "helpers/test_helper"
 
 test_name "dsl::helpers::host_helpers #curl_with_retries" do
-
   step "#curl_with_retries CURRENTLY fails with a RuntimeError if retries are exhausted without fetching the specified URL" do
     # NOTE: would expect that this would raise Beaker::Host::CommandFailure
 

data/acceptance/tests/base/dsl/helpers/host_helpers/on_test.rb

@@ -1,7 +1,6 @@
 require "helpers/test_helper"
 
 test_name "dsl::helpers::host_helpers #on" do
-
   step "#on raises an exception when remote command fails" do
     assert_raises(Beaker::Host::CommandFailure) do
       on default, "/bin/nonexistent-command"
@@ -9,7 +8,7 @@ test_name "dsl::helpers::host_helpers #on" do
   end
 
   step "#on makes command output available via `.stdout` on success" do
-    output = on(default, %Q{echo "echo via on"}).stdout
+    output = on(default, %{echo "echo via on"}).stdout
     assert_equal "echo via on\n", output
   end
 
@@ -19,7 +18,7 @@ test_name "dsl::helpers::host_helpers #on" do
   end
 
   step "#on makes exit status available via `.exit_code`" do
-    status = on(default, %Q{echo "echo via on"}).exit_code
+    status = on(default, %{echo "echo via on"}).exit_code
     assert_equal 0, status
   end
 
@@ -33,7 +32,7 @@ test_name "dsl::helpers::host_helpers #on" do
 
   step "#on with :acceptable_exit_codes will fail for other exit codes" do
     assert_raises(Beaker::Host::CommandFailure) do
-      on default, %Q{echo "echo via on"}, :acceptable_exit_codes => [127]
+      on default, %{echo "echo via on"}, :acceptable_exit_codes => [127]
     end
   end
 
@@ -48,7 +47,7 @@ test_name "dsl::helpers::host_helpers #on" do
     # Run a command which is (basically) guaranteed to have distinct output
     # on every host, and only requires bash to be present to run on any of
     # our platforms.
-    results = on hosts, %Q{echo "${RANDOM}:${RANDOM}:${RANDOM}"}
+    results = on hosts, %{echo "${RANDOM}:${RANDOM}:${RANDOM}"}
 
     # assert that we got results back for every host
     assert_equal hosts.size, results.size
@@ -67,7 +66,7 @@ test_name "dsl::helpers::host_helpers #on" do
     # Run a command which is (basically) guaranteed to have distinct output
     # on every host, and only requires bash to be present to run on any of
     # our platforms.
-    results = on :agent, %Q{echo "${RANDOM}:${RANDOM}:${RANDOM}"}
+    results = on :agent, %{echo "${RANDOM}:${RANDOM}:${RANDOM}"}
 
     # assert that we got results back for every host
     assert_equal hosts.size, results.size
@@ -86,7 +85,7 @@ test_name "dsl::helpers::host_helpers #on" do
     # Run a command which is (basically) guaranteed to have distinct output
     # on every host, and only requires bash to be present to run on any of
     # our platforms.
-    results = on "agent", %Q{echo "${RANDOM}:${RANDOM}:${RANDOM}"}
+    results = on "agent", %{echo "${RANDOM}:${RANDOM}:${RANDOM}"}
 
     # assert that we got results back for every host
     assert_equal hosts.size, results.size
@@ -102,16 +101,19 @@ test_name "dsl::helpers::host_helpers #on" do
   end
 
   step "#on allows assertions to be used in the optional block" do
-    on hosts, %Q{echo "${RANDOM}:${RANDOM}"} do
-      assert_match(/\d+:\d+/, stdout)
+    on hosts, %{echo "${RANDOM}:${RANDOM}"} do |result|
+      assert_match(/\d+:\d+/, result.stdout)
     end
   end
 
   step "#on executes in parallel with :run_in_parallel => true" do
+    # beaker-docker can't deal with closing the connection
+    confine :except, :hypervisor => 'docker'
+
     parent_pid = Process.pid
-    results = on( hosts, %Q{echo "${RANDOM}:${RANDOM}:${RANDOM}"}, :run_in_parallel => true) {
+    results = on(hosts, %{echo "${RANDOM}:${RANDOM}:${RANDOM}"}, :run_in_parallel => true) do
       assert(Process.pid != parent_pid)
-    }
+    end
 
     # assert that we got results back for every host
     assert_equal hosts.size, results.size
@@ -127,14 +129,17 @@ test_name "dsl::helpers::host_helpers #on" do
   end
 
   step "#on in parallel exits after all processes complete if an exception is raised in one process" do
+    # beaker-docker can't deal with closing the connection
+    confine :except, :hypervisor => 'docker'
+
     start = Time.now
 
     tmp = nil
     assert_raises NoMethodError do
-      on( hosts, %Q{echo "blah"}, :run_in_parallel => true) {
+      on(hosts, %{echo "blah"}, :run_in_parallel => true) do
         sleep(1)
         tmp.blah
-      }
+      end
     end
     assert(Time.now > start + 1)
   end

data/acceptance/tests/base/dsl/helpers/host_helpers/retry_on_test.rb

@@ -4,7 +4,7 @@ test_name "dsl::helpers::host_helpers #retry_on" do
   step "#retry_on CURRENTLY fails with a RuntimeError if command does not pass after all retries" do
     # NOTE: would have expected this to fail with Beaker::Hosts::CommandFailure
 
-    remote_tmpdir = default.tmpdir()
+    remote_tmpdir = default.tmpdir
     remote_script_file = File.join(remote_tmpdir, "test.sh")
     create_remote_file_from_fixture("retry_script", default, remote_tmpdir, "test.sh")
 
@@ -14,7 +14,7 @@ test_name "dsl::helpers::host_helpers #retry_on" do
   end
 
   step "#retry_on succeeds if command passes before retries are exhausted" do
-    remote_tmpdir = default.tmpdir()
+    remote_tmpdir = default.tmpdir
     remote_script_file = File.join(remote_tmpdir, "test.sh")
     create_remote_file_from_fixture("retry_script", default, remote_tmpdir, "test.sh")
 
@@ -27,7 +27,7 @@ test_name "dsl::helpers::host_helpers #retry_on" do
     # NOTE: would expect this to work across hosts, or be better documented and
     #       to raise Beaker::Host::CommandFailure
 
-    remote_tmpdir = default.tmpdir()
+    remote_tmpdir = default.tmpdir
     remote_script_file = File.join(remote_tmpdir, "test.sh")
 
     hosts.each do |host|

data/acceptance/tests/base/dsl/helpers/host_helpers/rsync_to_test.rb

@@ -2,7 +2,6 @@ require "helpers/test_helper"
 require "rsync"
 
 test_name "dsl::helpers::host_helpers #rsync_to" do
-
   def rsync_to_with_backups hosts, local_filename, remote_dir
     result = nil
     repeat_fibonacci_style_for(10) do
@@ -12,11 +11,7 @@ test_name "dsl::helpers::host_helpers #rsync_to" do
         ) # return of block is whether or not we're done repeating
         return result.success? if result.is_a? Rsync::Result
 
-        result.each do |individual_result| 
-          next if individual_result.success?
-          return false
-        end
-        true
+        result.all? { |individual_result| individual_result.success? }
       rescue Beaker::Host::CommandFailure => e
         logger.info("create_remote_file threw command failure, details: ")
         logger.info("  #{e}")
@@ -29,7 +24,6 @@ test_name "dsl::helpers::host_helpers #rsync_to" do
 
   # NOTE: there does not seem to be a reliable way to confine to cygwin hosts.
   confine_block :to, :platform => /windows/ do
-
     # NOTE: rsync works fine on Windows as long as you use POSIX-style paths.
     # However, these tests use Host#tmpdir which outputs mixed-style paths
     # e.g. C:/cygwin64/tmp/beaker.Rp9G6L - Fix me with BKR-1503
@@ -37,7 +31,7 @@ test_name "dsl::helpers::host_helpers #rsync_to" do
     step "#rsync_to CURRENTLY fails on windows systems" do
       Dir.mktmpdir do |local_dir|
         local_filename, _contents = create_local_file_from_fixture("simple_text_file", local_dir, "testfile.txt")
-        remote_tmpdir = default.tmpdir()
+        remote_tmpdir = default.tmpdir
 
         assert_raises Beaker::Host::CommandFailure do
           rsync_to default, local_filename, remote_tmpdir
@@ -56,8 +50,11 @@ test_name "dsl::helpers::host_helpers #rsync_to" do
     # However, these tests use Host#tmpdir which outputs mixed-style paths
     # e.g. C:/cygwin64/tmp/beaker.Rp9G6L - Fix me with BKR-1503
 
+    # rsync is broken on beaker-docker
+    confine :except, :hypervisor => 'docker'
+
     step "#rsync_to fails if the local file cannot be found" do
-      remote_tmpdir = default.tmpdir()
+      remote_tmpdir = default.tmpdir
       assert_raises IOError do
         rsync_to default, "/non/existent/file.txt", remote_tmpdir
       end
@@ -119,20 +116,19 @@ test_name "dsl::helpers::host_helpers #rsync_to" do
     step "#rsync_to creates the file on the remote system" do
       Dir.mktmpdir do |local_dir|
         local_filename, contents = create_local_file_from_fixture("simple_text_file", local_dir, "testfile.txt")
-        remote_tmpdir = default.tmpdir()
+        remote_tmpdir = default.tmpdir
         remote_filename = File.join(remote_tmpdir, "testfile.txt")
 
         result = rsync_to_with_backups default, local_filename, remote_tmpdir
 
         fails_intermittently("https://tickets.puppetlabs.com/browse/QENG-3053",
-          "default"         => default,
-          "contents"        => contents,
-          "local_filename"  => local_filename,
-          "local_dir"       => local_dir,
-          "remote_filename" => remote_filename,
-          "remote_tmdir"    => remote_tmpdir,
-          "result"          => result.inspect,
-        ) do
+                             "default" => default,
+                             "contents" => contents,
+                             "local_filename" => local_filename,
+                             "local_dir" => local_dir,
+                             "remote_filename" => remote_filename,
+                             "remote_tmdir" => remote_tmpdir,
+                             "result" => result.inspect) do
           remote_contents = on(default, "cat #{remote_filename}").stdout
           assert_equal contents, remote_contents
         end
@@ -142,7 +138,7 @@ test_name "dsl::helpers::host_helpers #rsync_to" do
     step "#rsync_to creates the file on all remote systems when a host array is provided" do
       Dir.mktmpdir do |local_dir|
         local_filename, contents = create_local_file_from_fixture("simple_text_file", local_dir, "testfile.txt")
-        remote_tmpdir = default.tmpdir()
+        remote_tmpdir = default.tmpdir
         on hosts, "mkdir -p #{remote_tmpdir}"
         remote_filename = File.join(remote_tmpdir, "testfile.txt")
 
@@ -150,14 +146,13 @@ test_name "dsl::helpers::host_helpers #rsync_to" do
 
         hosts.each do |host|
           fails_intermittently("https://tickets.puppetlabs.com/browse/QENG-3053",
-            "host"            => host,
-            "contents"        => contents,
-            "local_filename"  => local_filename,
-            "local_dir"       => local_dir,
-            "remote_filename" => remote_filename,
-            "remote_tmdir"    => remote_tmpdir,
-            "result"          => result.inspect,
-          ) do
+                               "host" => host,
+                               "contents" => contents,
+                               "local_filename" => local_filename,
+                               "local_dir" => local_dir,
+                               "remote_filename" => remote_filename,
+                               "remote_tmdir" => remote_tmpdir,
+                               "result" => result.inspect) do
             remote_contents = on(host, "cat #{remote_filename}").stdout
             assert_equal contents, remote_contents
           end

data/acceptance/tests/base/dsl/helpers/host_helpers/run_cron_on_test.rb

@@ -1,9 +1,7 @@
 require "helpers/test_helper"
 
 test_name "dsl::helpers::host_helpers #run_cron_on" do
-
   confine_block :to, :platform => /windows/ do
-
     step "#run_cron_on fails on windows platforms when listing cron jobs for a user on a host" do
       assert_raises Beaker::Host::CommandFailure do
         run_cron_on default, :list, default['user']
@@ -12,7 +10,6 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
   end
 
   confine_block :to, :platform => /solaris/ do
-
     step "#run_cron_on CURRENTLY does nothing and returns `nil` when an unknown command is provided" do
       # NOTE: would have expected this to raise Beaker::Host::CommandFailure instead
 
@@ -39,7 +36,7 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
     end
 
     step "#run_cron_on CURRENTLY does not fail, but returns nil, when adding cron jobs for an unknown user" do
-      result = run_cron_on default, :add, "nonexistentuser", %Q{* * * * * /bin/echo "hello" >/dev/null}
+      result = run_cron_on default, :add, "nonexistentuser", %{* * * * * /bin/echo "hello" >/dev/null}
       assert_nil result
     end
 
@@ -49,7 +46,7 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
     end
 
     step "#run_cron_on can add a cron job for a user on a host" do
-      run_cron_on default, :add, default['user'], %Q{* * * * * /bin/echo "hello" >/dev/null}
+      run_cron_on default, :add, default['user'], %{* * * * * /bin/echo "hello" >/dev/null}
       result = run_cron_on default, :list, default['user']
       assert_equal 0, result.exit_code
       assert_match %r{/bin/echo}, result.stdout
@@ -60,13 +57,13 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
       #       cron entries.  See also: https://github.com/puppetlabs/beaker/pull/937#discussion_r38338494
 
       1.upto(3) do |job_number|
-        run_cron_on default, :add, default['user'], %Q{* * * * * /bin/echo "job :#{job_number}:" >/dev/null}
+        run_cron_on default, :add, default['user'], %{* * * * * /bin/echo "job :#{job_number}:" >/dev/null}
       end
 
       result = run_cron_on default, :list, default['user']
 
-      assert_no_match %r{job :1:}, result.stdout
-      assert_no_match %r{job :2:}, result.stdout
+      refute_match %r{job :1:}, result.stdout
+      refute_match %r{job :2:}, result.stdout
       assert_match %r{job :3:}, result.stdout
     end
 
@@ -74,7 +71,7 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
       # NOTE: would have expected a more granular approach to removing cron jobs
       #       for a user on a host.  This should otherwise be better documented.
 
-      run_cron_on default, :add, default['user'], %Q{* * * * * /bin/echo "quality: job 1" >/dev/null}
+      run_cron_on default, :add, default['user'], %{* * * * * /bin/echo "quality: job 1" >/dev/null}
       result = run_cron_on default, :list, default['user']
       assert_match %r{quality: job 1}, result.stdout
 
@@ -125,7 +122,6 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
   end
 
   confine_block :except, :platform => /windows|solaris/ do
-
     step "#run_cron_on CURRENTLY does nothing and returns `nil` when an unknown command is provided" do
       # NOTE: would have expected this to raise Beaker::Host::CommandFailure instead
 
@@ -154,7 +150,7 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
 
     step "#run_cron_on fails when adding cron jobs for an unknown user" do
       assert_raises Beaker::Host::CommandFailure do
-        run_cron_on default, :add, "nonexistentuser", %Q{* * * * * /bin/echo "hello" >/dev/null}
+        run_cron_on default, :add, "nonexistentuser", %{* * * * * /bin/echo "hello" >/dev/null}
       end
     end
 
@@ -165,7 +161,7 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
     end
 
     step "#run_cron_on can add a cron job for a user on a host" do
-      run_cron_on default, :add, default['user'], %Q{* * * * * /bin/echo "hello" >/dev/null}
+      run_cron_on default, :add, default['user'], %{* * * * * /bin/echo "hello" >/dev/null}
       result = run_cron_on default, :list, default['user']
       assert_equal 0, result.exit_code
       assert_match %r{/bin/echo}, result.stdout
@@ -176,13 +172,13 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
       #       cron entries.  See also: https://github.com/puppetlabs/beaker/pull/937#discussion_r38338494
 
       1.upto(3) do |job_number|
-        run_cron_on default, :add, default['user'], %Q{* * * * * /bin/echo "job :#{job_number}:" >/dev/null}
+        run_cron_on default, :add, default['user'], %{* * * * * /bin/echo "job :#{job_number}:" >/dev/null}
       end
 
       result = run_cron_on default, :list, default['user']
 
-      assert_no_match %r{job :1:}, result.stdout
-      assert_no_match %r{job :2:}, result.stdout
+      refute_match %r{job :1:}, result.stdout
+      refute_match %r{job :2:}, result.stdout
       assert_match %r{job :3:}, result.stdout
     end
 
@@ -190,7 +186,7 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
       # NOTE: would have expected a more granular approach to removing cron jobs
       #       for a user on a host.  This should otherwise be better documented.
 
-      run_cron_on default, :add, default['user'], %Q{* * * * * /bin/echo "quality: job 1" >/dev/null}
+      run_cron_on default, :add, default['user'], %{* * * * * /bin/echo "quality: job 1" >/dev/null}
       result = run_cron_on default, :list, default['user']
       assert_match %r{quality: job 1}, result.stdout
 

data/acceptance/tests/base/dsl/helpers/host_helpers/run_script_on_test.rb

@@ -1,7 +1,6 @@
 require "helpers/test_helper"
 
 test_name "dsl::helpers::host_helpers #run_script_on" do
-
   step "#run_script_on fails when the local script cannot be found" do
     assert_raises IOError do
       run_script_on default, "/non/existent/testfile.sh"
@@ -41,9 +40,9 @@ test_name "dsl::helpers::host_helpers #run_script_on" do
     Dir.mktmpdir do |local_dir|
       local_filename, _contents = create_local_file_from_fixture("shell_script_with_output", local_dir, "testfile.sh", "a+x")
 
-      run_script_on default, local_filename do
-        assert_equal 0, exit_code
-        assert_equal "output\n", stdout
+      run_script_on default, local_filename do |result|
+        assert_equal 0, result.exit_code
+        assert_equal "output\n", result.stdout
       end
     end
   end

data/acceptance/tests/base/dsl/helpers/host_helpers/run_script_test.rb

@@ -40,9 +40,9 @@ test_name "dsl::helpers::host_helpers #run_script" do
     Dir.mktmpdir do |local_dir|
       local_filename, _contents = create_local_file_from_fixture("shell_script_with_output", local_dir, "testfile.sh", "a+x")
 
-      run_script local_filename do
-        assert_equal 0, exit_code
-        assert_equal "output\n", stdout
+      run_script local_filename do |result|
+        assert_equal 0, result.exit_code
+        assert_equal "output\n", result.stdout
       end
     end
   end

data/acceptance/tests/base/dsl/helpers/host_helpers/scp_from_test.rb

@@ -3,7 +3,7 @@ require "helpers/test_helper"
 test_name "dsl::helpers::host_helpers #scp_from" do
   if test_scp_error_on_close?
     step "#scp_from fails if the local path cannot be found" do
-      remote_tmpdir = default.tmpdir()
+      remote_tmpdir = default.tmpdir
       remote_filename, _contents = create_remote_file_from_fixture("simple_text_file", default, remote_tmpdir, "testfile.txt")
 
       assert_raises Beaker::Host::CommandFailure do
@@ -22,7 +22,7 @@ test_name "dsl::helpers::host_helpers #scp_from" do
 
   step "#scp_from creates the file on the local system" do
     Dir.mktmpdir do |local_dir|
-      remote_tmpdir = default.tmpdir()
+      remote_tmpdir = default.tmpdir
       remote_filename, contents = create_remote_file_from_fixture("simple_text_file", default, remote_tmpdir, "testfile.txt")
 
       scp_from default, remote_filename, local_dir
@@ -37,10 +37,10 @@ test_name "dsl::helpers::host_helpers #scp_from" do
     #       file repeatedly to generate an error
 
     Dir.mktmpdir do |local_dir|
-      remote_tmpdir = default.tmpdir()
+      remote_tmpdir = default.tmpdir
       remote_filename = File.join(remote_tmpdir, "testfile.txt")
       on hosts, "mkdir -p #{remote_tmpdir}"
-      on hosts, %Q{echo "${RANDOM}:${RANDOM}:${RANDOM}" > #{remote_filename}}
+      on hosts, %{echo "${RANDOM}:${RANDOM}:${RANDOM}" > #{remote_filename}}
 
       scp_from hosts, remote_filename, local_dir
       remote_contents = on(hosts.last, "cat #{remote_filename}").stdout

data/acceptance/tests/base/dsl/helpers/host_helpers/scp_to_test.rb

@@ -2,7 +2,7 @@ require "helpers/test_helper"
 
 test_name "dsl::helpers::host_helpers #scp_to" do
   step "#scp_to fails if the local file cannot be found" do
-    remote_tmpdir = default.tmpdir()
+    remote_tmpdir = default.tmpdir
     assert_raises IOError do
       scp_to default, "/non/existent/file.txt", remote_tmpdir
     end
@@ -24,7 +24,7 @@ test_name "dsl::helpers::host_helpers #scp_to" do
   step "#scp_to creates the file on the remote system" do
     Dir.mktmpdir do |local_dir|
       local_filename, contents = create_local_file_from_fixture("simple_text_file", local_dir, "testfile.txt")
-      remote_tmpdir = default.tmpdir()
+      remote_tmpdir = default.tmpdir
 
       scp_to default, local_filename, remote_tmpdir
 
@@ -38,7 +38,7 @@ test_name "dsl::helpers::host_helpers #scp_to" do
     Dir.mktmpdir do |local_dir|
       local_filename, contents = create_local_file_from_fixture("simple_text_file", local_dir, "testfile.txt")
 
-      remote_tmpdir = default.tmpdir()
+      remote_tmpdir = default.tmpdir
       on hosts, "mkdir -p #{remote_tmpdir}"
       remote_filename = File.join(remote_tmpdir, "testfile.txt")
 
@@ -50,5 +50,4 @@ test_name "dsl::helpers::host_helpers #scp_to" do
       end
     end
   end
-
 end