beaker 4.38.1 → 5.0.0

data/acceptance/tests/base/dsl/platform_tag_confiner_test.rb

@@ -13,32 +13,29 @@ test_name "DSL::Structure::PlatformTagConfiner" do
   end
 
   step "#{pstc_method_name} can remove hosts from a test, or be skipped if empty" do
-    assert hosts.length() > 0, "#{pstc_method_name} did not have enough hosts to test"
+    assert hosts.length > 0, "#{pstc_method_name} did not have enough hosts to test"
     previous_hosts = hosts.dup
 
     options[:platform_tag_confines] = [
       :platform => /#{default[:platform]}/,
       :tag_reason_hash => {
-        'tag1' => 'reason1'
-      }
+        'tag1' => 'reason1',
+      },
     ]
 
     begin
-      tag( 'tag1' )
+      tag('tag1')
     rescue Beaker::DSL::Outcomes::SkipTest => e
-      if e.message =~ /^No\ suitable\ hosts\ found/
-        # SkipTest is raised in the case when there are no hosts leftover for a test
-        # after confining. It's a very common acceptance test case where all of the
-        # hosts involved are of the same platform, and are thus all confined
-        # away by the code being run here. In this case, the hosts object will not
-        # be altered, but should be considered a pass, since the fact that SkipTest
-        # is being raised confirms that a lower number of hosts are coming out of
-        # the confine (0) than came in (>0, according to our pre-condition assertion)
-      else
-        fail "#{pstc_method_name} raised unexpected SkipTest exception: #{e}"
-      end
+      fail "#{pstc_method_name} raised unexpected SkipTest exception: #{e}" unless /^No\ suitable\ hosts\ found/.match?(e.message)
+    # SkipTest is raised in the case when there are no hosts leftover for a test
+    # after confining. It's a very common acceptance test case where all of the
+    # hosts involved are of the same platform, and are thus all confined
+    # away by the code being run here. In this case, the hosts object will not
+    # be altered, but should be considered a pass, since the fact that SkipTest
+    # is being raised confirms that a lower number of hosts are coming out of
+    # the confine (0) than came in (>0, according to our pre-condition assertion)
     else
-      assert hosts.length() < previous_hosts.length(), "#{pstc_method_name} did not change hosts array"
+      assert hosts.length < previous_hosts.length, "#{pstc_method_name} did not change hosts array"
     end
 
     # cleanup
@@ -46,4 +43,4 @@ test_name "DSL::Structure::PlatformTagConfiner" do
     options[:platform_tag_confines] = nil
     @hosts = previous_hosts
   end
-end
+end

data/acceptance/tests/base/dsl/structure_test.rb

@@ -3,11 +3,10 @@ test_name "dsl::structure" do
     begin
       @in_confine = 0
       confine_block :to, :platform => default["platform"] do
-        @in_confine +=1
+        @in_confine += 1
       end
 
       assert_equal 1, @in_confine, "#confine_block did not run the supplied block"
-
     rescue Beaker::DSL::Outcomes::SkipTest => e
       fail "#confine_block raised unexpected SkipTest exception: #{e}"
     end
@@ -15,16 +14,13 @@ test_name "dsl::structure" do
 
   step "#confine_block leaves hosts array intact after running block on matching hosts" do
     begin
-      previous_hosts = hosts.dup
-
       @in_confine = 0
       confine_block :to, :platform => default["platform"] do
-        @in_confine +=1
+        @in_confine += 1
       end
 
       assert_equal 1, @in_confine, "#confine_block did not run the supplied block"
       assert_equal hosts.dup, hosts, "#confine_block did not preserve the hosts array"
-
     rescue Beaker::DSL::Outcomes::SkipTest => e
       fail "#confine_block raised unexpected SkipTest exception: #{e}"
     end
@@ -34,11 +30,10 @@ test_name "dsl::structure" do
     begin
       @in_confine = 0
       confine_block :except, :platform => default["platform"] do
-        @in_confine +=1
+        @in_confine += 1
       end
 
       assert_equal 0, @in_confine, "#confine_block did not skip the supplied block"
-
     rescue Beaker::DSL::Outcomes::SkipTest => e
       fail "#confine_block raised unexpected SkipTest exception: #{e}"
     end
@@ -46,32 +41,27 @@ test_name "dsl::structure" do
 
   step "#confine_block leaves hosts array intact after skipping block on non-matching hosts" do
     begin
-      previous_hosts = hosts.dup
-
       @in_confine = 0
       confine_block :except, :platform => default["platform"] do
-        @in_confine +=1
+        @in_confine += 1
       end
 
       assert_equal 0, @in_confine, "#confine_block did not skip the supplied block"
       assert_equal hosts.dup, hosts, "#confine_block did not preserve the hosts array"
-
     rescue Beaker::DSL::Outcomes::SkipTest => e
       fail "#confine_block raised unexpected SkipTest exception: #{e}"
     end
   end
 
   step "#confine_block allows blocks to raise skip_test" do
-    previous_hosts = hosts.dup
-
     begin
       @in_confine = 0
       confine_block :to, :platform => default["platform"] do
-        @in_confine +=1
+        @in_confine += 1
         skip_test "this block raises a skip"
       end
     rescue Beaker::DSL::Outcomes::SkipTest => e
-      assert_match /this block raises a skip/, e.message, "#confine_block raised an unexpected skip_test"
+      assert_match(/this block raises a skip/, e.message, "#confine_block raised an unexpected skip_test")
       assert_equal 1, @in_confine, "#confine_block did not execute supplied block"
       assert_equal hosts.dup, hosts, "#confine_block did not preserve the hosts array"
     end
@@ -82,9 +72,8 @@ test_name "dsl::structure" do
       confine :to, { :platform => 'test' }
 
       fail "#confine did not skip test but should have."
-
     rescue Beaker::DSL::Outcomes::SkipTest => e
-      assert_match /No suitable hosts found with {:platform=>"test"}/, e.message, "#confine raised an unexpected skip_test"
+      assert_match(/No suitable hosts found with {:platform=>"test"}/, e.message, "#confine raised an unexpected skip_test")
     end
   end
 
@@ -93,10 +82,9 @@ test_name "dsl::structure" do
       confine :except, { :platform => default['platform'] }
 
       fail "#confine did not skip test but should have."
-
     rescue Beaker::DSL::Outcomes::SkipTest => e
-      assert_match /No suitable hosts found without {:platform=>"#{default['platform']}"}/, e.message, "#confine raised an unexpected
-      # skip_test"
+      assert_match(/No suitable hosts found without {:platform=>"#{default['platform']}"}/, e.message, "#confine raised an unexpected
+      # skip_test")
     end
   end
 end

data/acceptance/tests/base/host/file_test.rb

@@ -11,7 +11,7 @@ test_name 'File Test' do
       tmpfile = host.tmpfile('beaker')
       # ensure we have a user to chown to
       host.chown('testuser', tmpfile)
-      assert_match /testuser/, host.ls_ld(tmpfile), "Should have found testuser in `ls -ld` output"
+      assert_match(/testuser/, host.ls_ld(tmpfile), "Should have found testuser in `ls -ld` output")
     end
   end
 
@@ -21,7 +21,7 @@ test_name 'File Test' do
       tmpdir = host.tmpdir('beaker')
       # ensure we have a user to chown to
       host.chgrp('testgroup', tmpdir)
-      assert_match /testgroup/, host.ls_ld(tmpdir), "Should have found testgroup in `ls -ld` output: #{stdout}"
+      assert_match(/testgroup/, host.ls_ld(tmpdir), "Should have found testgroup in `ls -ld` output")
     end
   end
 
@@ -31,7 +31,7 @@ test_name 'File Test' do
       tmpdir = host.tmpdir('beaker')
       on host, host.touch("#{tmpdir}/somefile.txt", false)
       host.chown('testuser', tmpdir, true)
-      assert_match /testuser/, host.ls_ld("#{tmpdir}/somefile.txt"), "Should have found testuser in `ls -ld` output for sub-file"
+      assert_match(/testuser/, host.ls_ld("#{tmpdir}/somefile.txt"), "Should have found testuser in `ls -ld` output for sub-file")
     end
   end
 
@@ -41,7 +41,7 @@ test_name 'File Test' do
       tmpfile = host.tmpfile('beaker')
       # ensure we have a group to chgrp to
       host.chgrp('testgroup', tmpfile)
-      assert_match /testgroup/, host.ls_ld(tmpfile), "Should have found testgroup in `ls -ld` output"
+      assert_match(/testgroup/, host.ls_ld(tmpfile), "Should have found testgroup in `ls -ld` output")
     end
   end
 
@@ -51,7 +51,7 @@ test_name 'File Test' do
       tmpdir = host.tmpdir('beaker')
       # ensure we have a group to chgrp to
       host.chgrp('testgroup', tmpdir)
-      assert_match /testgroup/, host.ls_ld(tmpdir), "Should have found testgroup in `ls -ld` output"
+      assert_match(/testgroup/, host.ls_ld(tmpdir), "Should have found testgroup in `ls -ld` output")
     end
   end
 
@@ -61,7 +61,7 @@ test_name 'File Test' do
       tmpdir = host.tmpdir('beaker')
       on host, host.touch("#{tmpdir}/somefile.txt", false)
       host.chgrp('testgroup', tmpdir, true)
-      assert_match /testgroup/, host.ls_ld("#{tmpdir}/somefile.txt"), "Should have found testgroup in `ls -ld` output for sub-file"
+      assert_match(/testgroup/, host.ls_ld("#{tmpdir}/somefile.txt"), "Should have found testgroup in `ls -ld` output for sub-file")
     end
   end
 
@@ -69,7 +69,7 @@ test_name 'File Test' do
     hosts.each do |host|
       # create a tmp file to mangle
       tmpdir = host.tmpdir('beaker')
-      assert_match /beaker/, host.ls_ld(tmpdir), "Should have found beaker in `ls -ld` output"
+      assert_match(/beaker/, host.ls_ld(tmpdir), "Should have found beaker in `ls -ld` output")
     end
   end
 
@@ -78,4 +78,4 @@ test_name 'File Test' do
     host.user_absent('testuser')
     host.group_absent('testgroup')
   end
-end
+end

data/acceptance/tests/base/host/group_test.rb

@@ -1,6 +1,6 @@
 test_name 'Group Test' do
   step "#group_get: has an Administrators group on Windows" do
-    hosts.select { |h| h['platform'] =~ /windows/ }.each do |host|
+    hosts.select { |h| h['platform'].include?('windows') }.each do |host|
       host.group_get('Administrators') do |result|
         refute_match(result.stdout, '1376', 'Output indicates Administrators not found')
       end
@@ -8,11 +8,10 @@ test_name 'Group Test' do
   end
 
   step "#group_get: should not have CroMags group on Windows" do
-    hosts.select { |h| h['platform'] =~ /windows/ }.each do |host|
+    hosts.select { |h| h['platform'].include?('windows') }.each do |host|
       assert_raises Beaker::Host::CommandFailure do
         host.group_get('CroMags') { |result| }
       end
     end
   end
-
 end

data/acceptance/tests/base/host/host_test.rb

@@ -20,7 +20,7 @@ end
 
 step "#is_x86_64? : can determine arch on hosts"
 hosts.each do |host|
-  if host['platform'] =~ /x86_64|_64|amd64|-64/
+  if /x86_64|_64|amd64|-64/.match?(host['platform'])
     assert_equal(true, host.is_x86_64?, "is_x86_64? should be true on #{host}: #{host['platform']}")
   else
     assert_equal(false, host.is_x86_64?, "is_x86_64? should be false on #{host}: #{host['platform']}")
@@ -34,7 +34,7 @@ hosts.each do |host|
   env_value1 = "#{env_prefix}_v1"
 
   host.clear_env_var(env_param1)
-  host.add_env_var(env_param1,env_value1)
+  host.add_env_var(env_param1, env_value1)
 
   val = host.get_env_var(env_param1)
 
@@ -57,12 +57,12 @@ hosts.each do |host|
   host.clear_env_var(env_param1)
   host.clear_env_var(env_param2)
   host.clear_env_var(env_param3)
-  host.add_env_var(env_param1,env_value1)
-  host.add_env_var(env_param1,env_value2)
-  host.add_env_var(env_param1,env_value3)
+  host.add_env_var(env_param1, env_value1)
+  host.add_env_var(env_param1, env_value2)
+  host.add_env_var(env_param1, env_value3)
 
   val = host.get_env_var(env_id)
-  assert('' == val,'get_env_var should not match a partial env key name')
+  assert('' == val, 'get_env_var should not match a partial env key name')
 end
 
 step "#get_env_var : should not return a match from a key\'s value"
@@ -72,10 +72,10 @@ hosts.each do |host|
   env_value1 = "#{env_prefix}_v1"
 
   host.clear_env_var(env_param1)
-  host.add_env_var(env_param1,env_value1)
+  host.add_env_var(env_param1, env_value1)
 
   val = host.get_env_var(env_value1)
-  assert('' == val,'get_env_var should not return a match from a key\'s value')
+  assert('' == val, 'get_env_var should not return a match from a key\'s value')
 end
 
 step "#clear_env_var : should only remove the specified key"
@@ -92,9 +92,9 @@ hosts.each do |host|
   env_param3 = "#{env_id}"
   env_value3 = "#{env_id}"
 
-  host.add_env_var(env_param1,env_value1)
-  host.add_env_var(env_param2,env_value2)
-  host.add_env_var(env_param3,env_value3)
+  host.add_env_var(env_param1, env_value1)
+  host.add_env_var(env_param2, env_value2)
+  host.add_env_var(env_param3, env_value3)
 
   host.clear_env_var(env_param3)
 
@@ -103,7 +103,7 @@ hosts.each do |host|
   val = host.get_env_var(env_param2)
   assert_match(/^#{env_param2}=#{env_value2}$/, val, "#{env_param2} should exist after calling clear_env_var")
   val = host.get_env_var(env_param3)
-  assert('' == val,"#{env_param3} should not exist after calling clear_env_var")
+  assert('' == val, "#{env_param3} should not exist after calling clear_env_var")
 end
 
 step "#add_env_var : can add a unique environment variable"
@@ -121,9 +121,9 @@ hosts.each do |host|
   host.clear_env_var(env_param1)
   host.clear_env_var(env_param2)
   host.clear_env_var(env_param3)
-  host.add_env_var(env_param1,env_value1)
-  host.add_env_var(env_param2,env_value2)
-  host.add_env_var(env_param3,env_value3)
+  host.add_env_var(env_param1, env_value1)
+  host.add_env_var(env_param2, env_value2)
+  host.add_env_var(env_param3, env_value3)
 
   val = host.get_env_var(env_param1)
   assert_match(/^#{env_param1}=#{env_value1}$/, val, "#{env_param1} should exist")
@@ -150,23 +150,27 @@ hosts.each do |host|
   assert_match(/TEST=3(;|:)2(;|:)1$/, val, "add_env_var can correctly add env vars")
 end
 
-step "#add_env_var : can preserve an environment between ssh connections"
-hosts.each do |host|
-  host.clear_env_var("TEST")
-  logger.debug("add TEST=1")
-  host.add_env_var("TEST", "1")
-  logger.debug("add TEST=1 again (shouldn't create duplicate entry)")
-  host.add_env_var("TEST", "1")
-  logger.debug("add TEST=2")
-  host.add_env_var("TEST", "2")
-  logger.debug("ensure that TEST env var has correct setting")
-  logger.debug("add TEST=3")
-  host.add_env_var("TEST", "3")
-  logger.debug("close the connection")
-  host.close
-  logger.debug("ensure that TEST env var has correct setting")
-  val = host.get_env_var("TEST")
-  assert_match(/TEST=3(;|:)2(;|:)1$/, val, "can preserve an environment between ssh connections")
+step "#add_env_var : can preserve an environment between ssh connections" do
+  # beaker-docker can't deal with closing the connection
+  confine :except, :hypervisor => 'docker'
+
+  hosts.each do |host|
+    host.clear_env_var("TEST")
+    logger.debug("add TEST=1")
+    host.add_env_var("TEST", "1")
+    logger.debug("add TEST=1 again (shouldn't create duplicate entry)")
+    host.add_env_var("TEST", "1")
+    logger.debug("add TEST=2")
+    host.add_env_var("TEST", "2")
+    logger.debug("ensure that TEST env var has correct setting")
+    logger.debug("add TEST=3")
+    host.add_env_var("TEST", "3")
+    logger.debug("close the connection")
+    host.close
+    logger.debug("ensure that TEST env var has correct setting")
+    val = host.get_env_var("TEST")
+    assert_match(/TEST=3(;|:)2(;|:)1$/, val, "can preserve an environment between ssh connections")
+  end
 end
 
 step "#delete_env_var : can delete an environment"
@@ -187,9 +191,9 @@ end
 
 step "#mkdir_p : can recursively create a directory structure on a host"
 hosts.each do |host|
-  #clean up first!
+  # clean up first!
   host.rm_rf("test1")
-  #test dir construction
+  # test dir construction
   logger.debug("create test1/test2/test3/test4")
   assert_equal(true, host.mkdir_p("test1/test2/test3/test4"), "can create directory structure")
   logger.debug("should be able to create a file in the new dir")
@@ -197,23 +201,23 @@ hosts.each do |host|
 end
 
 step "#do_scp_to : can copy a directory to the host with no ignores"
-current_dir = File.dirname(__FILE__)
+current_dir = __dir__
 module_fixture = File.join(current_dir, "../../../fixtures/module")
 hosts.each do |host|
   logger.debug("can recursively copy a module over")
-  #make sure that we are clean on the test host
+  # make sure that we are clean on the test host
   host.rm_rf("module")
   host.do_scp_to(module_fixture, ".", {})
   Dir.mktmpdir do |tmp_dir|
-    #grab copy from host
+    # grab copy from host
     host.do_scp_from("module", tmp_dir, {})
-    #compare to local copy
+    # compare to local copy
     local_paths = Dir.glob(File.join(module_fixture, "**/*")).select { |f| File.file?(f) }
     host_paths  = Dir.glob(File.join(File.join(tmp_dir, "module"), "**/*")).select { |f| File.file?(f) }
-    #each local file should have a single match on the host
+    # each local file should have a single match on the host
     local_paths.each do |path|
-      search_name = path.gsub(/^.*fixtures\//, '') #reduce down to the path that should match
-      matched = host_paths.select{ |check| check =~ /#{Regexp.escape(search_name)}$/ }
+      search_name = path.gsub(/^.*fixtures\//, '') # reduce down to the path that should match
+      matched = host_paths.select { |check| /#{Regexp.escape(search_name)}$/.match?(check) }
       assert_equal(1, matched.length, "should have found a single instance of path #{search_name}, found #{matched.length}: \n #{matched}")
       host_paths = host_paths - matched
     end
@@ -222,25 +226,25 @@ hosts.each do |host|
 end
 
 step "#do_scp_to with :ignore : can copy a dir to the host, excluding ignored patterns that DO NOT appear in the source absolute path"
-current_dir = File.dirname(__FILE__)
+current_dir = __dir__
 module_fixture = File.expand_path(File.join(current_dir, "../../../fixtures/module"))
 hosts.each do |host|
   logger.debug("can recursively copy a module over, ignoring some files/dirs")
-  #make sure that we are clean on the test host
+  # make sure that we are clean on the test host
   host.rm_rf("module")
-  host.do_scp_to(module_fixture, ".", {:ignore => ['tests', 'Gemfile']})
+  host.do_scp_to(module_fixture, ".", { :ignore => %w[tests Gemfile] })
   Dir.mktmpdir do |tmp_dir|
-    #grab copy from host
+    # grab copy from host
     host.do_scp_from("module", tmp_dir, {})
-    #compare to local copy
+    # compare to local copy
     local_paths = Dir.glob(File.join(module_fixture, "**/*")).select { |f| File.file?(f) }
     host_paths  = Dir.glob(File.join(File.join(tmp_dir, "module"), "**/*")).select { |f| File.file?(f) }
-    #each local file should have a single match on the host
+    # each local file should have a single match on the host
     local_paths.each do |path|
-      search_name = path.gsub(/^.*fixtures\//, '') #reduce down to the path that should match
-      matched = host_paths.select{ |check| check =~ /#{Regexp.escape(search_name)}$/ }
-      re =  /((\/|\A)tests(\/|\z))|((\/|\A)Gemfile(\/|\z))/
-      if path !~ re
+      search_name = path.gsub(/^.*fixtures\//, '') # reduce down to the path that should match
+      matched = host_paths.select { |check| /#{Regexp.escape(search_name)}$/.match?(check) }
+      re = /((\/|\A)tests(\/|\z))|((\/|\A)Gemfile(\/|\z))/
+      if !path&.match?(re)
         assert_equal(1, matched.length, "should have found a single instance of path #{search_name}, found #{matched.length}: \n #{matched}")
       else
         assert_equal(0, matched.length, "should have found no instances of path #{search_name}, found #{matched.length}: \n #{matched}")
@@ -252,25 +256,26 @@ hosts.each do |host|
 end
 
 step "#do_scp_to with :ignore : can copy a dir to the host, excluding ignored patterns that DO appear in the source absolute path"
-current_dir = File.dirname(__FILE__)
+current_dir = __dir__
 module_fixture = File.expand_path(File.join(current_dir, "../../../fixtures/module"))
 hosts.each do |host|
   logger.debug("can recursively copy a module over, ignoring some sub-files/sub-dirs that also appear in the absolute path")
-  #make sure that we are clean on the test host
+  # make sure that we are clean on the test host
   host.rm_rf("module")
-  host.do_scp_to(module_fixture, ".", {:ignore => ['module', 'Gemfile']})
+  host.do_scp_to(module_fixture, ".", { :ignore => %w[module Gemfile] })
   Dir.mktmpdir do |tmp_dir|
-    #grab copy from host
+    # grab copy from host
     host.do_scp_from("module", tmp_dir, {})
-    #compare to local copy
+    # compare to local copy
     local_paths = Dir.glob(File.join(module_fixture, "**/*")).select { |f| File.file?(f) }
     host_paths  = Dir.glob(File.join(File.join(tmp_dir, "module"), "**/*")).select { |f| File.file?(f) }
-    #each local file should have a single match on the host
+    # each local file should have a single match on the host
     local_paths.each do |path|
-      search_name = path.gsub(/^.*fixtures\/module\//, '') #reduce down to the path that should match
-      matched = host_paths.select{ |check| check =~ /#{Regexp.escape(search_name)}$/ }
-      re =  /((\/|\A)module(\/|\z))|((\/|\A)Gemfile(\/|\z))/
-      if path.gsub(/^.*module\//, '') !~ re
+      search_name = path.gsub(/^.*fixtures\/module\//, '') # reduce down to the path that should match
+      search_name_regex = /#{Regexp.escape(search_name)}$/
+      matched = host_paths.select { |check| search_name_regex.match?(check) }
+      re = /((\/|\A)module(\/|\z))|((\/|\A)Gemfile(\/|\z))/
+      if !path.gsub(/^.*module\//, '')&.match?(re)
         assert_equal(1, matched.length, "should have found a single instance of path #{search_name}, found #{matched.length}: \n #{matched}")
       else
         assert_equal(0, matched.length, "should have found no instances of path #{search_name}, found #{matched.length}: \n #{matched}")
@@ -282,9 +287,10 @@ hosts.each do |host|
 end
 
 step "Ensure scp errors close the ssh connection" do
+  # beaker-docker can't deal with closing the connection
+  confine :except, :hypervisor => 'docker'
 
   step 'Attempt to generate a remote file that does not exist' do
-
     # This assert relies on the behavior of the net-scp library to
     # raise an error when #channel.on_close is called, which is called by
     # indirectly called by beaker's own SshConnection #close mehod. View
@@ -301,7 +307,6 @@ step "Ensure scp errors close the ssh connection" do
   end
 
   step 'Attempt to scp from a resource on the SUT that does not exist' do
-
     # This assert relies on the behavior of the net-scp library to
     # use the Dir.mkdir method in the #download_start_state method.
     # See the source for further info:
@@ -318,7 +323,7 @@ step "Ensure scp errors close the ssh connection" do
 end
 
 step 'Ensure that a long 128+ character string with UTF-8 characters does not break net-ssh' do
-  long_string = 'a' * 128 + "\u06FF"
+  long_string = ('a' * 128) + "\u06FF"
   on(default, "mkdir /tmp/#{long_string}")
   result = on(default, 'ls /tmp')
   assert(result.stdout.include?(long_string), 'Error in folder creation with long string + UTF-8 characters')
@@ -327,6 +332,4 @@ step 'Ensure that a long 128+ character string with UTF-8 characters does not br
   on(default, "rm -rf /tmp/#{long_string}")
   result = on(default, 'ls /tmp')
   assert(!result.stdout.include?(long_string), 'Error in folder deletion with long string + UTF-8 characters')
-
 end
-

data/acceptance/tests/base/host/packages.rb

@@ -2,29 +2,26 @@ test_name 'confirm packages on hosts behave correctly'
 confine :except, :platform => %w(osx)
 
 def get_host_pkg(host)
-  case
-    when host['platform'] =~ /sles-10/
-      Beaker::HostPrebuiltSteps::SLES10_PACKAGES
-    when host['platform'] =~ /opensuse|sles-/
-      Beaker::HostPrebuiltSteps::SLES_PACKAGES
-    when host['platform'] =~ /debian/
-      Beaker::HostPrebuiltSteps::DEBIAN_PACKAGES
-    when host['platform'] =~ /cumulus/
-      Beaker::HostPrebuiltSteps::CUMULUS_PACKAGES
-    when (host['platform'] =~ /windows/ and host.is_cygwin?)
-      Beaker::HostPrebuiltSteps::WINDOWS_PACKAGES
-    when (host['platform'] =~ /windows/ and not host.is_cygwin?)
-      Beaker::HostPrebuiltSteps::PSWINDOWS_PACKAGES
-    when host['platform'] =~ /freebsd/
-      Beaker::HostPrebuiltSteps::FREEBSD_PACKAGES
-    when host['platform'] =~ /openbsd/
-      Beaker::HostPrebuiltSteps::OPENBSD_PACKAGES
-    when host['platform'] =~ /solaris-10/
-      Beaker::HostPrebuiltSteps::SOLARIS10_PACKAGES
-    else
-      Beaker::HostPrebuiltSteps::UNIX_PACKAGES
+  case host['platform']
+  when /sles-10/
+    Beaker::HostPrebuiltSteps::SLES10_PACKAGES
+  when /opensuse|sles-/
+    Beaker::HostPrebuiltSteps::SLES_PACKAGES
+  when /debian/
+    Beaker::HostPrebuiltSteps::DEBIAN_PACKAGES
+  when /cumulus/
+    Beaker::HostPrebuiltSteps::CUMULUS_PACKAGES
+  when /windows/
+    host.is_cygwin? ? Beaker::HostPrebuiltSteps::WINDOWS_PACKAGES : Beaker::HostPrebuiltSteps::PSWINDOWS_PACKAGES
+  when /freebsd/
+    Beaker::HostPrebuiltSteps::FREEBSD_PACKAGES
+  when /openbsd/
+    Beaker::HostPrebuiltSteps::OPENBSD_PACKAGES
+  when /solaris-10/
+    Beaker::HostPrebuiltSteps::SOLARIS10_PACKAGES
+  else
+    Beaker::HostPrebuiltSteps::UNIX_PACKAGES
   end
-
 end
 
 step '#check_for_command : can determine where a command exists'
@@ -50,12 +47,13 @@ hosts.each do |host|
   # this works on Windows as well, althought it pulls in
   # a lot of dependencies.
   # skipping this test for windows since it requires a restart
-  next if host['platform'] =~ /windows/
+  next if host['platform'].include?('windows')
+
   package = 'zsh'
-  package = 'CSWzsh' if host['platform'] =~ /solaris-10/
-  package = 'git' if host['platform'] =~ /opensuse|sles/
+  package = 'CSWzsh' if host['platform'].include?('solaris-10')
+  package = 'git' if /opensuse|sles/.match?(host['platform'])
 
-  if host['platform'] =~ /solaris-11/
+  if host['platform'].include?('solaris-11')
     logger.debug("#{package} should be uninstalled on #{host}")
     host.uninstall_package(package)
     assert_equal(false, host.check_for_package(package), "'#{package}' should not be installed")
@@ -66,19 +64,18 @@ hosts.each do |host|
   cmdline_args = ''
   # Newer vmpooler hosts created by Packer templates, and running Cygwin 2.4,
   # must have these switches passed
-  cmdline_args = '--local-install --download' if (host['platform'] =~ /windows/ and host.is_cygwin?)
+  cmdline_args = '--local-install --download' if (host['platform'].include?('windows') and host.is_cygwin?)
   host.install_package(package, cmdline_args)
   assert(host.check_for_package(package), "'#{package}' should be installed")
 
   # windows does not support uninstall_package
-  unless host['platform'] =~ /windows/
+  unless host['platform'].include?('windows')
     logger.debug("#{package} should be uninstalled on #{host}")
     host.uninstall_package(package)
-    if host['platform'] =~ /debian/
+    if host['platform'].include?('debian')
       assert_equal(false, host.check_for_command(package), "'#{package}' should not be installed or available")
     else
       assert_equal(false, host.check_for_package(package), "'#{package}' should not be installed")
     end
   end
-
 end