beaker 4.38.1 → 5.0.0

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

@@ -4,9 +4,9 @@ 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")
-    remote_filename, contents = create_remote_file_from_fixture("retry_script", default, remote_tmpdir, "test.sh")
+    create_remote_file_from_fixture("retry_script", default, remote_tmpdir, "test.sh")
 
     assert_raises RuntimeError do
       retry_on default, "bash #{remote_script_file} #{remote_tmpdir} 10", { :max_retries => 2, :retry_interval => 0.1 }
@@ -14,9 +14,9 @@ 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")
-    remote_filename, contents = create_remote_file_from_fixture("retry_script", default, remote_tmpdir, "test.sh")
+    create_remote_file_from_fixture("retry_script", default, remote_tmpdir, "test.sh")
 
     result = retry_on default, "bash #{remote_script_file} #{remote_tmpdir} 2", { :max_retries => 4, :retry_interval => 0.1 }
     assert_equal 0, result.exit_code
@@ -27,16 +27,16 @@ 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|
       on host, "mkdir -p #{remote_tmpdir}"
-      remote_filename, contents = create_remote_file_from_fixture("retry_script", host, remote_tmpdir, "test.sh")
+      create_remote_file_from_fixture("retry_script", host, remote_tmpdir, "test.sh")
     end
 
     assert_raises NoMethodError do
-      result = retry_on hosts, "bash #{remote_script_file} #{remote_tmpdir} 2", { :max_retries => 4, :retry_interval => 0.1 }
+      retry_on hosts, "bash #{remote_script_file} #{remote_tmpdir} 2", { :max_retries => 4, :retry_interval => 0.1 }
     end
   end
 end

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,14 +11,10 @@ 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
-      rescue Beaker::Host::CommandFailure => err
+        result.all? { |individual_result| individual_result.success? }
+      rescue Beaker::Host::CommandFailure => e
         logger.info("create_remote_file threw command failure, details: ")
-        logger.info("  #{err}")
+        logger.info("  #{e}")
         logger.info("continuing back-off execution")
         false
       end
@@ -29,15 +24,14 @@ 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
 
     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()
+        local_filename, _contents = create_local_file_from_fixture("simple_text_file", local_dir, "testfile.txt")
+        remote_tmpdir = default.tmpdir
 
         assert_raises Beaker::Host::CommandFailure do
           rsync_to default, local_filename, remote_tmpdir
@@ -45,7 +39,7 @@ test_name "dsl::helpers::host_helpers #rsync_to" do
 
         remote_filename = File.join(remote_tmpdir, "testfile.txt")
         assert_raises Beaker::Host::CommandFailure do
-          remote_contents = on(default, "cat #{remote_filename}").stdout
+          on(default, "cat #{remote_filename}").stdout
         end
       end
     end
@@ -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
@@ -73,7 +70,7 @@ test_name "dsl::helpers::host_helpers #rsync_to" do
             rsync_package = "rsync"
             # solaris-10 uses OpenCSW pkgutil, which prepends "CSW" to its provided packages
             # TODO: fix this with BKR-1502
-            rsync_package = "CSWrsync" if host['platform'] =~ /solaris-10/
+            rsync_package = "CSWrsync" if host['platform'].include?('solaris-10')
             host.uninstall_package rsync_package
           else
             host[:rsync_installed] = false
@@ -84,11 +81,10 @@ test_name "dsl::helpers::host_helpers #rsync_to" do
       # rsync is preinstalled on OSX
       step "#rsync_to fails if rsync is not installed on the remote host" do
         Dir.mktmpdir do |local_dir|
-          local_filename, contents = create_local_file_from_fixture("simple_text_file", local_dir, "testfile.txt")
+          local_filename, _contents = create_local_file_from_fixture("simple_text_file", local_dir, "testfile.txt")
 
           hosts.each do |host|
             remote_tmpdir = host.tmpdir("beaker")
-            remote_filename = File.join(remote_tmpdir, "testfile.txt")
 
             assert_raises Beaker::Host::CommandFailure do
               rsync_to default, local_filename, remote_tmpdir
@@ -106,7 +102,7 @@ test_name "dsl::helpers::host_helpers #rsync_to" do
 
     step "#rsync_to fails if the remote path cannot be found" do
       Dir.mktmpdir do |local_dir|
-        local_filename, contents = create_local_file_from_fixture("simple_text_file", local_dir, "testfile.txt")
+        local_filename, _contents = create_local_file_from_fixture("simple_text_file", local_dir, "testfile.txt")
 
         assert_raises Beaker::Host::CommandFailure do
           rsync_to default, local_filename, "/non/existent/testfile.txt"
@@ -120,21 +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",
-          "result"          => result,
-          "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
@@ -144,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")
 
@@ -152,15 +146,13 @@ test_name "dsl::helpers::host_helpers #rsync_to" do
 
         hosts.each do |host|
           fails_intermittently("https://tickets.puppetlabs.com/browse/QENG-3053",
-            "result"          => result,
-            "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
@@ -178,7 +170,7 @@ test_name "dsl::helpers::host_helpers #rsync_to" do
             rsync_package = "rsync"
             # solaris-10 uses OpenCSW pkgutil, which prepends "CSW" to its provided packages
             # TODO: fix this with BKR-1502
-            rsync_package = "CSWrsync" if host['platform'] =~ /solaris-10/
+            rsync_package = "CSWrsync" if host['platform'].include?('solaris-10')
             host.uninstall_package rsync_package
           end
           host.delete(:rsync_installed)

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
 
@@ -118,14 +115,13 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
 
       hosts.each do |host|
         assert_raises Beaker::Host::CommandFailure do
-          results = run_cron_on host, :list, host['user']
+          run_cron_on host, :list, host['user']
         end
       end
     end
   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
 
@@ -234,7 +230,7 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
 
       hosts.each do |host|
         assert_raises Beaker::Host::CommandFailure do
-          results = run_cron_on host, :list, host['user']
+          run_cron_on host, :list, host['user']
         end
       end
     end

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"
@@ -10,8 +9,7 @@ test_name "dsl::helpers::host_helpers #run_script_on" do
 
   step "#run_script_on fails when there is an error running the remote script" do
     Dir.mktmpdir do |local_dir|
-      local_filename = File.join(local_dir, "testfile.sh")
-      local_filename, contents = create_local_file_from_fixture("failing_shell_script", local_dir, "testfile.sh", "a+x")
+      local_filename, _contents = create_local_file_from_fixture("failing_shell_script", local_dir, "testfile.sh", "a+x")
 
       assert_raises Beaker::Host::CommandFailure do
         run_script_on default, local_filename
@@ -21,8 +19,7 @@ test_name "dsl::helpers::host_helpers #run_script_on" do
 
   step "#run_script_on passes along options when running the remote command" do
     Dir.mktmpdir do |local_dir|
-      local_filename = File.join(local_dir, "testfile.sh")
-      local_filename, contents = create_local_file_from_fixture("failing_shell_script", local_dir, "testfile.sh", "a+x")
+      local_filename, _contents = create_local_file_from_fixture("failing_shell_script", local_dir, "testfile.sh", "a+x")
 
       result = run_script_on default, local_filename, { :accept_all_exit_codes => true }
       assert_equal 1, result.exit_code
@@ -31,8 +28,7 @@ test_name "dsl::helpers::host_helpers #run_script_on" do
 
   step "#run_script_on runs the script on the remote host" do
     Dir.mktmpdir do |local_dir|
-      local_filename = File.join(local_dir, "testfile.sh")
-      local_filename, contents = create_local_file_from_fixture("shell_script_with_output", local_dir, "testfile.sh", "a+x")
+      local_filename, _contents = create_local_file_from_fixture("shell_script_with_output", local_dir, "testfile.sh", "a+x")
 
       results = run_script_on default, local_filename
       assert_equal 0, results.exit_code
@@ -42,20 +38,18 @@ test_name "dsl::helpers::host_helpers #run_script_on" do
 
   step "#run_script_on allows assertions in an optional block" do
     Dir.mktmpdir do |local_dir|
-      local_filename = File.join(local_dir, "testfile.sh")
-      local_filename, contents = create_local_file_from_fixture("shell_script_with_output", local_dir, "testfile.sh", "a+x")
+      local_filename, _contents = create_local_file_from_fixture("shell_script_with_output", local_dir, "testfile.sh", "a+x")
 
-      results = 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
 
   step "#run_script_on runs the script on all remote hosts when a host array is provided" do
     Dir.mktmpdir do |local_dir|
-      local_filename = File.join(local_dir, "testfile.sh")
-      local_filename, contents = create_local_file_from_fixture("shell_script_with_output", local_dir, "testfile.sh", "a+x")
+      local_filename, _contents = create_local_file_from_fixture("shell_script_with_output", local_dir, "testfile.sh", "a+x")
 
       results = run_script_on hosts, local_filename
 

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

@@ -9,8 +9,7 @@ test_name "dsl::helpers::host_helpers #run_script" do
 
   step "#run_script fails when there is an error running the remote script" do
     Dir.mktmpdir do |local_dir|
-      local_filename = File.join(local_dir, "testfile.sh")
-      local_filename, contents = create_local_file_from_fixture("failing_shell_script", local_dir, "testfile.sh", "a+x")
+      local_filename, _contents = create_local_file_from_fixture("failing_shell_script", local_dir, "testfile.sh", "a+x")
 
       assert_raises Beaker::Host::CommandFailure do
         run_script local_filename
@@ -20,8 +19,7 @@ test_name "dsl::helpers::host_helpers #run_script" do
 
   step "#run_script passes along options when running the remote command" do
     Dir.mktmpdir do |local_dir|
-      local_filename = File.join(local_dir, "testfile.sh")
-      local_filename, contents = create_local_file_from_fixture("failing_shell_script", local_dir, "testfile.sh", "a+x")
+      local_filename, _contents = create_local_file_from_fixture("failing_shell_script", local_dir, "testfile.sh", "a+x")
 
       result = run_script local_filename, { :accept_all_exit_codes => true }
       assert_equal 1, result.exit_code
@@ -30,8 +28,7 @@ test_name "dsl::helpers::host_helpers #run_script" do
 
   step "#run_script runs the script on the remote host" do
     Dir.mktmpdir do |local_dir|
-      local_filename = File.join(local_dir, "testfile.sh")
-      local_filename, contents = create_local_file_from_fixture("shell_script_with_output", local_dir, "testfile.sh", "a+x")
+      local_filename, _contents = create_local_file_from_fixture("shell_script_with_output", local_dir, "testfile.sh", "a+x")
 
       results = run_script local_filename
       assert_equal 0, results.exit_code
@@ -41,12 +38,11 @@ test_name "dsl::helpers::host_helpers #run_script" do
 
   step "#run_script allows assertions in an optional block" do
     Dir.mktmpdir do |local_dir|
-      local_filename = File.join(local_dir, "testfile.sh")
-      local_filename, contents = create_local_file_from_fixture("shell_script_with_output", local_dir, "testfile.sh", "a+x")
+      local_filename, _contents = create_local_file_from_fixture("shell_script_with_output", local_dir, "testfile.sh", "a+x")
 
-      results = 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,8 +3,8 @@ 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_filename, contents = create_remote_file_from_fixture("simple_text_file", default, remote_tmpdir, "testfile.txt")
+      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
         scp_from default, remote_filename, "/non/existent/file.txt"
@@ -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}"
-      results = 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
@@ -11,7 +11,7 @@ test_name "dsl::helpers::host_helpers #scp_to" do
   if test_scp_error_on_close?
     step "#scp_to fails if the remote path cannot be found" do
       Dir.mktmpdir do |local_dir|
-        local_filename, contents = create_local_file_from_fixture("simple_text_file", local_dir, "testfile.txt")
+        local_filename, _contents = create_local_file_from_fixture("simple_text_file", local_dir, "testfile.txt")
 
         # assert_raises Beaker::Host::CommandFailure do
         assert_raises RuntimeError do
@@ -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

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

@@ -8,31 +8,31 @@ test_name "dsl::helpers::host_helpers #shell" do
   end
 
   step "#shell makes command output available via `.stdout` on success" do
-    output = shell(%Q{echo "echo via on"}).stdout
+    output = shell(%{echo "echo via on"}).stdout
     assert_equal "echo via on\n", output
   end
 
   step "#shell makes command error output available via `.stderr` on success" do
     output = shell("/bin/nonexistent-command", :acceptable_exit_codes => [0, 127]).stderr
-    assert_match /No such file/, output
+    assert_match(/No such file/, output)
   end
 
   step "#shell makes exit status available via `.exit_code`" do
-    status = shell(%Q{echo "echo via on"}).exit_code
+    status = shell(%{echo "echo via on"}).exit_code
     assert_equal 0, status
   end
 
   step "#shell with :acceptable_exit_codes will not fail for named exit codes" do
     result = shell "/bin/nonexistent-command", :acceptable_exit_codes => [0, 127]
     output = result.stderr
-    assert_match /No such file/, output
+    assert_match(/No such file/, output)
     status = result.exit_code
     assert_equal 127, status
   end
 
   step "#shell with :acceptable_exit_codes will fail for other exit codes" do
     assert_raises(Beaker::Host::CommandFailure) do
-      shell %Q{echo "echo via on"}, :acceptable_exit_codes => [127]
+      shell %{echo "echo via on"}, :acceptable_exit_codes => [127]
     end
   end
 
@@ -40,12 +40,12 @@ test_name "dsl::helpers::host_helpers #shell" do
     result = shell "env", { :environment => { 'FOO' => 'bar' } }
     output = result.stdout
 
-    assert_match /\bFOO=bar\b/, output
+    assert_match(/\bFOO=bar\b/, output)
   end
 
   step "#shell allows assertions to be used in the optional block" do
-    shell %Q{echo "${RANDOM}:${RANDOM}"} do
-      assert_match /\d+:\d+/, stdout
+    shell %{echo "${RANDOM}:${RANDOM}"} do |result|
+      assert_match(/\d+:\d+/, result.stdout)
     end
   end
 end

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

@@ -1,10 +1,8 @@
 require "helpers/test_helper"
 
 test_name "dsl::helpers::host_helpers #upgrade_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)
@@ -20,7 +18,6 @@ test_name "dsl::helpers::host_helpers #upgrade_package" do
   end
 
   confine_block :to, :platform => /osx/ do
-
     step "#upgrade_package CURRENTLY fails with a RuntimeError on OS X" do
       # NOTE: documentation could be better on this method
       assert_raises RuntimeError do
@@ -30,8 +27,10 @@ test_name "dsl::helpers::host_helpers #upgrade_package" do
   end
 
   confine_block :except, :platform => /windows|osx/ do
-    confine_block :to, :platform => /centos|el-\d/ do
+    # rsync is broken on beaker-docker
+    confine :except, :hypervisor => 'docker'
 
+    confine_block :to, :platform => /centos|el-\d/ do
       step "#upgrade_package CURRENTLY does not fail on CentOS if unknown package is specified" do
         # NOTE: I would expect this to fail with an Beaker::Host::CommandFailure,
         #       but maybe it's because yum doesn't really care:
@@ -43,12 +42,11 @@ test_name "dsl::helpers::host_helpers #upgrade_package" do
         #       > No Packages marked for Update
 
         result = upgrade_package default, "non-existent-package-name"
-        assert_match /No Packages marked for Update/i, result
+        assert_match(/No Packages marked for Update/i, result)
       end
     end
 
     confine_block :except, :platform => /centos|el-\d/ do
-
       step "#upgrade_package fails if package is not already installed" do
         assert_raises Beaker::Host::CommandFailure do
           upgrade_package default, "non-existent-package-name"