beaker 4.38.1 → 4.39.0

data/acceptance/fixtures/module/Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 
 puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 3.3']
+gem 'facter', '>= 1.7.0'
 gem 'puppet', puppetversion
 gem 'puppetlabs_spec_helper', '>= 0.1.0'
 gem 'puppet-lint', '>= 0.3.2'
-gem 'facter', '>= 1.7.0'
 
 group :system_tests do
   gem 'beaker-rspec', :require => false

data/acceptance/fixtures/module/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
-PuppetLint.configuration.send('disable_80chars')
+PuppetLint.configuration.send(:disable_80chars)
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
 
 desc "Validate manifests, templates, and ruby files"
@@ -10,7 +10,7 @@ task :validate do
     sh "puppet parser validate --noop #{manifest}"
   end
   Dir['spec/**/*.rb','lib/**/*.rb'].each do |ruby_file|
-    sh "ruby -c #{ruby_file}" unless ruby_file =~ /spec\/fixtures/
+    sh "ruby -c #{ruby_file}" unless ruby_file.include?('spec/fixtures')
   end
   Dir['templates/**/*.erb'].each do |template|
     sh "erb -P -x -T '-' #{template} | ruby -c"

data/acceptance/fixtures/module/spec/acceptance/demo_spec.rb

@@ -4,7 +4,7 @@ describe "my tests" do
 
   # an example using the beaker DSL
   # use http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL
-  it "should say hello!" do
+  it "says hello!" do
     result = shell( 'echo hello' )
     expect(result.stdout).to match(/hello/)
   end
@@ -12,7 +12,7 @@ describe "my tests" do
   # an example using Serverspec
   # use http://serverspec.org/resource_types.html
   describe package('puppet') do
-    it { should be_installed }
+    it { is_expected.to be_installed }
   end
 
   it "can create and confirm a file" do
@@ -22,7 +22,7 @@ describe "my tests" do
     shell( 'grep bar demo.txt', :acceptable_exit_codes => [1] )
   end
 
-  it "should be able to apply manifests" do
+  it "is able to apply manifests" do
     manifest_1 = "user {'foo':
           ensure => present,}"
     manifest_2 = "user {'foo':
@@ -35,15 +35,15 @@ describe "my tests" do
   end
 
   describe service('sshd') do
-    it { should be_running }
+    it { is_expected.to be_running }
   end
 
   describe user('root') do
-    it { should exist }
+    it { is_expected.to exist }
   end
 
   describe user('foo') do
-    it { should_not exist }
+    it { is_expected.not_to exist }
   end
 
   context "can use both serverspec and Beaker DSL" do
@@ -60,11 +60,8 @@ describe "my tests" do
     end
 
     describe file('/tmp/demo.txt') do
-      it { should be_file }
-    end
-
-    describe file('/tmp/demo.txt') do
-      it { should contain 'this is my file.' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'this is my file.' }
     end
   end
 

data/acceptance/fixtures/module/spec/classes/init_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 describe 'demo' do
 
   context 'with defaults for all parameters' do
-    it { should contain_class('demo') }
+    it { is_expected.to contain_class('demo') }
   end
 end

data/acceptance/lib/helpers/test_helper.rb

@@ -16,7 +16,7 @@ end
 
 # Returns the contents of a named fixture file, to be found in `fixture_path`.
 def fixture_contents(fixture)
-  fixture_file = Dir.entries(fixture_path).find { |e| /^#{fixture}$|#{fixture}\.[a-z]/ =~ e }
+  fixture_file = Dir.entries(fixture_path).find { |e| /^#{fixture}$|#{fixture}\.[a-z]/.match?(e) }
   File.read("#{fixture_path}/#{fixture_file}")
 end
 
@@ -65,11 +65,11 @@ end
 # Analyzer (or similar), to detect these failures without failing the build.
 #
 # Returns the value of the yielded block.
-def fails_intermittently(issue_link, args = {}, &block)
+def fails_intermittently(issue_link, args = {})
   raise ArgumentError, "provide a Jira ticket link" unless issue_link
   raise ArgumentError, "a block is required" unless block_given?
   yield
-rescue MiniTest::Assertion, StandardError, SignalException => boom # we have a test failure!
+rescue MiniTest::Assertion, StandardError, SignalException # we have a test failure!
   STDERR.puts "\n\nIntermittent test failure! See: #{issue_link}"
 
   if args.empty?

data/acceptance/tests/base/dsl/helpers/hocon_helpers_test.rb

@@ -20,7 +20,7 @@ test_name 'Hocon Helpers Test' do
   end
 
   step '#hocon_file_edit_on : set_value and verify it exists' do
-    hocon_file_edit_on(hosts, hocon_filename) do |host, doc|
+    hocon_file_edit_on(hosts, hocon_filename) do |_host, doc|
       doc2 = doc.set_value('c', '[4, 5]')
 
       assert(doc2.has_value?('c'), 'Should have inserted "c" value!')
@@ -35,7 +35,7 @@ test_name 'Hocon Helpers Test' do
         end
         fail('execution should not continue in failure mode')
       rescue ArgumentError => e
-        assert(e.to_s =~ /requires a filename/)
+        assert(e.to_s.include?('requires a filename'))
       else
         fail('No exception raised in failure mode')
       end
@@ -54,7 +54,7 @@ test_name 'Hocon Helpers Test' do
         hocon_file_edit_on(hosts, hocon_filename)
         fail('execution should not continue in failure mode')
       rescue ArgumentError => e
-        assert(e.to_s =~ /No block was provided/)
+        assert(e.to_s.include?('No block was provided'))
       else
         fail('No exception raised in failure mode')
       end
@@ -70,7 +70,7 @@ test_name 'Hocon Helpers Test' do
     end
 
     step '#hocon_file_edit_on : independently read value to verify save' do
-      hocon_file_edit_on(hosts, hocon_filename) do |host, doc|
+      hocon_file_edit_on(hosts, hocon_filename) do |_host, doc|
         msg_fail = 'Should have saved "a.b" value inserted in previous step'
         assert(doc.has_value?('a.b'), msg_fail)
       end
@@ -79,13 +79,13 @@ test_name 'Hocon Helpers Test' do
 
   step '#hocon_file_edit_in_place_on : verify auto-saving workflow' do
     step '#hocon_file_edit_in_place_on : set_value and save' do
-      hocon_file_edit_in_place_on(hosts, hocon_filename) do |host, doc|
+      hocon_file_edit_in_place_on(hosts, hocon_filename) do |_host, doc|
         doc.set_value('c.d', '[6, 2, 73, 4, 45]')
       end
     end
 
     step '#hocon_file_edit_in_place_on : verify save' do
-      hocon_file_edit_on(hosts, hocon_filename) do |host, doc|
+      hocon_file_edit_on(hosts, hocon_filename) do |_host, doc|
         msg_fail = 'Should have saved "c.d" value inserted in previous step'
         assert(doc.has_value?('c.d'), msg_fail)
       end

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

@@ -9,14 +9,14 @@ test_name "dsl::helpers::host_helpers #archive_file_from" do
 
     # Prepare cleanup so we don't pollute the local filesystem
     teardown do
-      FileUtils.rm_rf('archive') if Dir.exists?('archive')
+      FileUtils.rm_rf('archive') if Dir.exist?('archive')
     end
 
     # Test that the archiveroot default directory is created
-    assert_equal(false, Dir.exists?('archive'))
-    assert_equal(false, Dir.exists?('archive/sut-files'))
+    assert_equal(false, Dir.exist?('archive'))
+    assert_equal(false, Dir.exist?('archive/sut-files'))
     archive_file_from(default, filepath)
-    assert_equal(true, Dir.exists?('archive/sut-files'))
+    assert_equal(true, Dir.exist?('archive/sut-files'))
   end
 
   step "fails archive_file_from when from_path is non-existant" do
@@ -30,13 +30,13 @@ test_name "dsl::helpers::host_helpers #archive_file_from" do
     # Create a remote file to archive
     filepath = default.tmpfile('archive-file-test')
     create_remote_file(default, filepath, 'number of the beast')
-    assert_equal(false, Dir.exists?(filepath))
+    assert_equal(false, Dir.exist?(filepath))
 
     # Test that the file is copied locally to <archiveroot>/<hostname>/<filepath>
     Dir.mktmpdir do |tmpdir|
       tar_path = File.join(tmpdir, default, filepath + '.tgz')
       archive_file_from(default, filepath, {}, tmpdir, tar_path)
-      assert(File.exists?(tar_path))
+      assert(File.exist?(tar_path))
       expected_path = File.join(tmpdir, default)
 
       tgz = Zlib::GzipReader.new(File.open(tar_path, 'rb'))

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

@@ -11,18 +11,16 @@ test_name "dsl::helpers::host_helpers #backup_the_file" do
 
   step "#backup_the_file will fail if the destination directory does not exist" do
     remote_source = default.tmpdir()
-    remote_source_filename = File.join(remote_source, "puppet.conf")
-    remote_filename, contents = create_remote_file_from_fixture("simple_text_file", default, remote_source, "puppet.conf")
+    create_remote_file_from_fixture("simple_text_file", default, remote_source, "puppet.conf")
 
     assert_raises Beaker::Host::CommandFailure do
-      result = backup_the_file default, remote_source, "/non/existent/"
+      backup_the_file default, remote_source, "/non/existent/"
     end
   end
 
   step "#backup_the_file copies `puppet.conf` from the source to the destination directory" do
     remote_source = default.tmpdir()
-    remote_source_filename = File.join(remote_source, "puppet.conf")
-    remote_filename, contents = create_remote_file_from_fixture("simple_text_file", default, remote_source, "puppet.conf")
+    _remote_filename, contents = create_remote_file_from_fixture("simple_text_file", default, remote_source, "puppet.conf")
 
     remote_destination = default.tmpdir()
     remote_destination_filename = File.join(remote_destination, "puppet.conf.bak")
@@ -36,8 +34,7 @@ test_name "dsl::helpers::host_helpers #backup_the_file" do
 
   step "#backup_the_file copies a named file from the source to the destination directory" do
     remote_source = default.tmpdir()
-    remote_source_filename = File.join(remote_source, "testfile.txt")
-    remote_filename, contents = create_remote_file_from_fixture("simple_text_file", default, remote_source, "testfile.txt")
+    _remote_filename, contents = create_remote_file_from_fixture("simple_text_file", default, remote_source, "testfile.txt")
 
     remote_destination = default.tmpdir()
     remote_destination_filename = File.join(remote_destination, "testfile.txt.bak")
@@ -51,14 +48,11 @@ test_name "dsl::helpers::host_helpers #backup_the_file" do
 
   step "#backup_the_file CURRENTLY will fail if given a hosts array" do
     remote_source = default.tmpdir()
-    remote_source_filename = File.join(remote_source, "testfile.txt")
-    remote_filename, contents = create_remote_file_from_fixture("simple_text_file", default, remote_source, "testfile.txt")
+    create_remote_file_from_fixture("simple_text_file", default, remote_source, "testfile.txt")
     remote_destination = default.tmpdir()
 
-    remote_destination_filename = File.join(remote_destination, "testfile.txt.bak")
-
     assert_raises NoMethodError do
-      result = backup_the_file hosts, remote_source, remote_destination
+      backup_the_file hosts, remote_source, remote_destination
     end
   end
 end

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

@@ -18,9 +18,9 @@ test_name "dsl::helpers::host_helpers #create_remote_file" do
           return false
         end
         true
-      rescue Beaker::Host::CommandFailure => err
+      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
@@ -192,7 +192,7 @@ test_name "dsl::helpers::host_helpers #create_remote_file" 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)
@@ -227,7 +227,7 @@ test_name "dsl::helpers::host_helpers #create_remote_file" do
       end
 
       assert_raises Beaker::Host::CommandFailure do
-        remote_contents = on(default, "cat #{remote_filename}").stdout
+        on(default, "cat #{remote_filename}").stdout
       end
     end
   end

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

@@ -38,7 +38,7 @@ test_name "dsl::helpers::host_helpers #curl_on" do
     end
     remote_targetfilename = File.join remote_tmpdir, "outfile.txt"
 
-    result = curl_on hosts, "-o #{remote_targetfilename} #{host_local_url default, remote_filename}"
+    curl_on hosts, "-o #{remote_targetfilename} #{host_local_url default, remote_filename}"
 
     hosts.each do |host|
       remote_contents = on(host, "cat #{remote_targetfilename}").stdout

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

@@ -13,7 +13,7 @@ test_name "dsl::helpers::host_helpers #deploy_package_repo" do
         version = "9.9.9"
         platform = default['platform']
 
-        local_filename, contents = create_local_file_from_fixture("simple_text_file", local_dir, "pl-#{name}-#{version}-repos-pe-#{platform}.repo")
+        create_local_file_from_fixture("simple_text_file", local_dir, "pl-#{name}-#{version}-repos-pe-#{platform}.repo")
 
         assert_nil deploy_package_repo(default, local_dir, name, version)
       end
@@ -29,7 +29,7 @@ test_name "dsl::helpers::host_helpers #deploy_package_repo" do
         platform = default['platform']
 
         FileUtils.mkdir(File.join(local_dir, "rpm"))
-        local_filename, contents = create_local_file_from_fixture("simple_text_file", File.join(local_dir, "rpm"), "pl-#{name}-#{version}-repos-pe-#{platform}.repo")
+        _local_filename, contents = create_local_file_from_fixture("simple_text_file", File.join(local_dir, "rpm"), "pl-#{name}-#{version}-repos-pe-#{platform}.repo")
 
         deploy_package_repo default, local_dir, name, version
 
@@ -49,7 +49,7 @@ test_name "dsl::helpers::host_helpers #deploy_package_repo" do
         version = "9.9.9"
         platform = default['platform']
 
-        local_filename, contents = create_local_file_from_fixture("simple_text_file", local_dir, "pl-#{name}-#{version}-repos-pe-#{platform}.repo")
+        create_local_file_from_fixture("simple_text_file", local_dir, "pl-#{name}-#{version}-repos-pe-#{platform}.repo")
 
         assert_raises NoMethodError do
           deploy_package_repo hosts, local_dir, name, version
@@ -67,7 +67,7 @@ test_name "dsl::helpers::host_helpers #deploy_package_repo" do
         codename = default['platform'].codename
 
         FileUtils.mkdir(File.join(local_dir, "deb"))
-        local_filename, contents = create_local_file_from_fixture("simple_text_file", File.join(local_dir, "deb"), "pl-#{name}-#{version}-#{codename}.list")
+        _local_filename, contents = create_local_file_from_fixture("simple_text_file", File.join(local_dir, "deb"), "pl-#{name}-#{version}-#{codename}.list")
 
         deploy_package_repo default, local_dir, name, version
 
@@ -88,7 +88,7 @@ test_name "dsl::helpers::host_helpers #deploy_package_repo" do
         codename = default['platform'].codename
 
         FileUtils.mkdir(File.join(local_dir, "deb"))
-        local_filename, contents = create_local_file_from_fixture("simple_text_file", File.join(local_dir, "deb"), "pl-#{name}-#{version}-#{codename}.list")
+        create_local_file_from_fixture("simple_text_file", File.join(local_dir, "deb"), "pl-#{name}-#{version}-#{codename}.list")
 
         assert_raises NoMethodError do
           deploy_package_repo hosts, local_dir, name, version
@@ -106,7 +106,7 @@ test_name "dsl::helpers::host_helpers #deploy_package_repo" do
         platform = default['platform']
 
         FileUtils.mkdir(File.join(local_dir, "rpm"))
-        local_filename, contents = create_local_file_from_fixture("#{default["platform"]}.repo", File.join(local_dir, "rpm"), "pl-#{name}-#{version}-repos-pe-#{platform}.repo")
+        create_local_file_from_fixture("#{default["platform"]}.repo", File.join(local_dir, "rpm"), "pl-#{name}-#{version}-repos-pe-#{platform}.repo")
 
         deploy_package_repo default, local_dir, name, version
 
@@ -131,7 +131,7 @@ test_name "dsl::helpers::host_helpers #deploy_package_repo" do
         version = "9.9.9"
         platform = default['platform']
 
-        local_filename, contents = create_local_file_from_fixture("simple_text_file", local_dir, "pl-#{name}-#{version}-repos-pe-#{platform}.repo")
+        create_local_file_from_fixture("simple_text_file", local_dir, "pl-#{name}-#{version}-repos-pe-#{platform}.repo")
 
         assert_raises RuntimeError do
           deploy_package_repo default, local_dir, name, version

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

@@ -15,7 +15,7 @@ test_name "dsl::helpers::host_helpers #on" do
 
   step "#on makes command error output available via `.stderr` on success" do
     output = on(default, "/bin/nonexistent-command", :acceptable_exit_codes => [0, 127]).stderr
-    assert_match /No such file/, output
+    assert_match(/No such file/, output)
   end
 
   step "#on makes exit status available via `.exit_code`" do
@@ -26,7 +26,7 @@ test_name "dsl::helpers::host_helpers #on" do
   step "#on with :acceptable_exit_codes will not fail for named exit codes" do
     result = on default, "/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
@@ -41,7 +41,7 @@ test_name "dsl::helpers::host_helpers #on" do
     result = on default, "env", { :environment => { 'FOO' => 'bar' } }
     output = result.stdout
 
-    assert_match /\bFOO=bar\b/, output
+    assert_match(/\bFOO=bar\b/, output)
   end
 
   step "#on runs command on all hosts when given a host array" do
@@ -103,7 +103,7 @@ test_name "dsl::helpers::host_helpers #on" do
 
   step "#on allows assertions to be used in the optional block" do
     on hosts, %Q{echo "${RANDOM}:${RANDOM}"} do
-      assert_match /\d+:\d+/, stdout
+      assert_match(/\d+:\d+/, stdout)
     end
   end
 

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

@@ -6,7 +6,7 @@ test_name "dsl::helpers::host_helpers #retry_on" do
 
     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 }
@@ -16,7 +16,7 @@ test_name "dsl::helpers::host_helpers #retry_on" do
   step "#retry_on succeeds if command passes before retries are exhausted" do
     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
@@ -32,11 +32,11 @@ test_name "dsl::helpers::host_helpers #retry_on" do
 
     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

@@ -17,9 +17,9 @@ test_name "dsl::helpers::host_helpers #rsync_to" do
           return false
         end
         true
-      rescue Beaker::Host::CommandFailure => err
+      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
@@ -36,7 +36,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")
+        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
@@ -45,7 +45,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
@@ -73,7 +73,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 +84,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 +105,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"
@@ -126,7 +125,6 @@ test_name "dsl::helpers::host_helpers #rsync_to" do
         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,
@@ -152,7 +150,6 @@ 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,
@@ -178,7 +175,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

@@ -118,7 +118,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
@@ -234,7 +234,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

@@ -10,8 +10,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 +20,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 +29,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,10 +39,9 @@ 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
+      run_script_on default, local_filename do
         assert_equal 0, exit_code
         assert_equal "output\n", stdout
       end
@@ -54,8 +50,7 @@ test_name "dsl::helpers::host_helpers #run_script_on" do
 
   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,10 +38,9 @@ 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
+      run_script local_filename do
         assert_equal 0, exit_code
         assert_equal "output\n", stdout
       end