beaker 4.40.0 → 5.0.0

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

@@ -8,7 +8,7 @@ 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
 
@@ -18,7 +18,7 @@ test_name "dsl::helpers::host_helpers #shell" do
   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
 
@@ -32,7 +32,7 @@ test_name "dsl::helpers::host_helpers #shell" do
 
   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
 
@@ -44,8 +44,8 @@ test_name "dsl::helpers::host_helpers #shell" do
   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:
@@ -48,7 +47,6 @@ test_name "dsl::helpers::host_helpers #upgrade_package" do
     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"

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 /^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
-        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
@@ -17,12 +16,11 @@ 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"
       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
@@ -32,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,12 +43,11 @@ 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"
       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
@@ -61,7 +57,7 @@ test_name "dsl::structure" do
     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
@@ -76,7 +72,6 @@ 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")
     end
@@ -87,7 +82,6 @@ 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")

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

@@ -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
 
@@ -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

@@ -14,5 +14,4 @@ test_name 'Group Test' do
       end
     end
   end
-
 end

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

@@ -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| /#{Regexp.escape(search_name)}$/.match?(check) }
+      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,24 +226,24 @@ 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| /#{Regexp.escape(search_name)}$/.match?(check) }
-      re =  /((\/|\A)tests(\/|\z))|((\/|\A)Gemfile(\/|\z))/
+      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
@@ -252,24 +256,25 @@ 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))/
+      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
@@ -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

@@ -22,7 +22,6 @@ def get_host_pkg(host)
   else
     Beaker::HostPrebuiltSteps::UNIX_PACKAGES
   end
-
 end
 
 step '#check_for_command : can determine where a command exists'
@@ -49,6 +48,7 @@ hosts.each do |host|
   # a lot of dependencies.
   # skipping this test for windows since it requires a restart
   next if host['platform'].include?('windows')
+
   package = 'zsh'
   package = 'CSWzsh' if host['platform'].include?('solaris-10')
   package = 'git' if /opensuse|sles/.match?(host['platform'])
@@ -78,5 +78,4 @@ hosts.each do |host|
       assert_equal(false, host.check_for_package(package), "'#{package}' should not be installed")
     end
   end
-
 end

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

@@ -1,62 +1,7 @@
 test_name 'confirm unix-specific package methods work'
 confine :except, :platform => %w(windows solaris osx)
 
-current_dir  = File.dirname(__FILE__)
-pkg_fixtures = File.expand_path(File.join(current_dir, '../../../fixtures/package'))
-pkg_name     = 'puppetserver'
-
-def clean_file(host, file)
-  unless file.nil?
-    filename = pkg_file(host, file)
-
-    if !filename.nil? && host.file_exist?(filename)
-      on(host, "rm -rf #{filename}")
-    end
-  end
-end
-
-def pkg_file(host, pkg_name)
-  if /debian|ubuntu/.match?(host['platform'])
-    "/etc/apt/sources.list.d/#{pkg_name}.list"
-  elsif host['platform'].include?('el')
-    "/etc/yum.repos.d/#{pkg_name}.repo"
-  else
-    nil
-  end
-end
-
 step '#update_apt_if_needed : can execute without raising an error'
 hosts.each do |host|
   host.update_apt_if_needed
 end
-
-step '#deploy_apt_repo : deploy puppet-server nightly repo'
-hosts.each do |host|
-
-  if /debian|ubuntu/.match?(host['platform'])
-    clean_file(host, pkg_name)
-    host.deploy_apt_repo(pkg_fixtures, pkg_name, 'latest')
-    assert(host.file_exist?(pkg_file(host, pkg_name)), 'apt file should exist')
-    clean_file(host, pkg_name)
-  end
-
-end
-
-step '#deploy_yum_repo : deploy puppet-server nightly repo'
-hosts.each do |host|
-
-  if host['platform'].include?('el')
-    clean_file(host, pkg_name)
-    host.deploy_yum_repo(pkg_fixtures, pkg_name, 'latest')
-    assert(host.file_exist?(pkg_file(host, pkg_name)), 'yum file should exist')
-    clean_file(host, pkg_name)
-  end
-
-end
-
-step '#deploy_package_repo : deploy puppet-server nightly repo'
-hosts.each do |host|
-  next if host['platform'].variant == 'sles' && Integer(host['platform'].version) < 12
-  host.deploy_package_repo(pkg_fixtures, pkg_name, 'latest')
-  clean_file(host, pkg_name)
-end

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

@@ -14,5 +14,4 @@ test_name 'User Test' do
       end
     end
   end
-
 end

data/acceptance/tests/base/host_prebuilt_steps/ssh_environment_test.rb

@@ -1,5 +1,4 @@
 test_name "confirm host prebuilt steps behave correctly" do
-
   confine_block :except, :platform => /f5|windows/ do
     step "confirm ssh environment file existence" do
       hosts.each do |host|
@@ -29,4 +28,4 @@ test_name "confirm host prebuilt steps behave correctly" do
       end
     end
   end
-end
+end

data/acceptance/tests/base/test_suite/export.rb

@@ -1,13 +1,10 @@
 test_name 'ensure tests can export arbitrary data' do
-
   step 'export nested hash' do
-    export({'middle earth' => {
-              'Hobbits' => ['Bilbo', 'Frodo'],
-              'Elves' => 'Arwen',
-              :total => {'numbers' => 42}
-              }
-           })
-    export({'another' => 'author'})
+    export({ 'middle earth' => {
+             'Hobbits' => %w[Bilbo Frodo],
+             'Elves' => 'Arwen',
+             :total => { 'numbers' => 42 },
+           } })
+    export({ 'another' => 'author' })
   end
-
 end

data/acceptance/tests/install/from_file.rb

@@ -6,15 +6,13 @@ step 'install arbitrary msi via url' do
   hosts.each do |host|
     if host['platform'].include?('win')
       # this should be implemented at the host/win/pkg.rb level someday
-      generic_install_msi_on(host, 'https://releases.hashicorp.com/vagrant/1.8.4/vagrant_1.8.4.msi', {}, {:debug => true})
+      generic_install_msi_on(host, 'https://releases.hashicorp.com/vagrant/1.8.4/vagrant_1.8.4.msi', {}, { :debug => true })
     end
   end
 end
 
 step 'install arbitrary dmg via url' do
   hosts.each do |host|
-    if host['platform'].include?('osx')
-      host.generic_install_dmg('https://releases.hashicorp.com/vagrant/1.8.4/vagrant_1.8.4.dmg', 'Vagrant', 'Vagrant.pkg')
-    end
+    host.generic_install_dmg('https://releases.hashicorp.com/vagrant/1.8.4/vagrant_1.8.4.dmg', 'Vagrant', 'Vagrant.pkg') if host['platform'].include?('osx')
   end
 end

data/acceptance/tests/load_path_bootstrap.rb

@@ -5,6 +5,6 @@
 begin
   require 'helpers/test_helper'
 rescue LoadError
-  $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+  $LOAD_PATH << File.expand_path(File.join(__dir__, '..', 'lib'))
   require 'helpers/test_helper'
 end