Merge pull request #9247 from puppetlabs/backport-9236-to-7.x

[Backport 7.x] Update deprecated Beaker methods

Author: mhashizume

acceptance/tests/agent/last_run_summary_report.rb

@@ -74,7 +74,7 @@
 
     step "Check that '#{statedir}' exists and has no 'last_run_summary.yaml' file" do
       on(agent, "ls #{statedir}",:acceptable_exit_codes => [0]) do |result|
-        assert_no_match(/last_run_summary.yaml/, result.stdout)
+        refute_match(/last_run_summary.yaml/, result.stdout)
       end
     end
 

acceptance/tests/aix/aix_package_provider.rb

@@ -11,8 +11,8 @@ def assert_package_version(package, expected_version)
     # The output of lslpp is a colon-delimited list like:
     # sudo:sudo.rte:1.8.6.4: : :C: :Configurable super-user privileges runtime: : : : : : :0:0:/:
     # We want the version, so grab the third field
-    on hosts, "lslpp -qLc #{package} | cut -f3 -d:" do
-      actual_version = stdout.chomp
+    on(hosts, "lslpp -qLc #{package} | cut -f3 -d:") do |result|
+      actual_version = result.stdout.chomp
       assert_equal(expected_version, actual_version, "Installed package version #{actual_version} does not match expected version #{expected_version}")
     end
   end

acceptance/tests/aix/nim_package_provider.rb

@@ -20,8 +20,8 @@ def assert_package_version(package, expected_version)
   # The output of lslpp is a colon-delimited list like:
   # sudo:sudo.rte:1.8.6.4: : :C: :Configurable super-user privileges runtime: : : : : : :0:0:/:
   # We want the version, so grab the third field
-  on hosts, "lslpp -qLc #{package} | cut -f3 -d:" do
-    actual_version = stdout.chomp
+  on(hosts, "lslpp -qLc #{package} | cut -f3 -d:") do |result|
+    actual_version = result.stdout.chomp
     assert_equal(expected_version, actual_version, "Installed package version #{actual_version} does not match expected version #{expected_version}")
   end
 end
@@ -109,11 +109,11 @@ def test_apply(package_name, ensure_value, expected_version)
     version = details[:old_version]
 
     manifest = get_manifest(package_name, version)
-    on hosts, puppet_apply("--verbose", "--detailed-exitcodes"),
+    on(hosts, puppet_apply("--verbose", "--detailed-exitcodes"),
        { :stdin => manifest,
-         :acceptable_exit_codes => [4,6] } do
+         :acceptable_exit_codes => [4,6] }) do |result|
 
-        assert_match(/NIM package provider is unable to downgrade packages/, stderr, "Didn't get an error about downgrading packages")
+        assert_match(/NIM package provider is unable to downgrade packages/, result.stderr, "Didn't get an error about downgrading packages")
     end
   end
 

acceptance/tests/allow_arbitrary_node_name_fact_for_agent.rb

@@ -10,8 +10,8 @@
 testdir = master.tmpdir("nodenamefact")
 node_names = []
 
-on agents, facter('kernel') do
-  node_names << stdout.chomp
+on agents, facter('kernel') do |result|
+  node_names << result.stdout.chomp
 end
 
 node_names.uniq!
@@ -147,8 +147,8 @@
   }
 
   with_puppet_running_on(master, master_opts, testdir) do
-    on(agents, puppet('agent', "--no-daemonize --verbose --onetime --node_name_fact kernel")) do
-      assert_match(/defined 'message'.*#{success_message}/, stdout)
+    on(agents, puppet('agent', "--no-daemonize --verbose --onetime --node_name_fact kernel")) do |result|
+      assert_match(/defined 'message'.*#{success_message}/, result.stdout)
     end
   end
 end

acceptance/tests/allow_arbitrary_node_name_for_agent.rb

@@ -127,8 +127,8 @@
     },
   }
   with_puppet_running_on(master, master_opts, testdir) do
-    on(agents, puppet('agent', "-t --node_name_value specified_node_name"), :acceptable_exit_codes => [0,2]) do
-      assert_match(/defined 'message'.*#{success_message}/, stdout)
+    on(agents, puppet('agent', "-t --node_name_value specified_node_name"), :acceptable_exit_codes => [0,2]) do |result|
+      assert_match(/defined 'message'.*#{success_message}/, result.stdout)
     end
   end
 end

acceptance/tests/apply/classes/parameterized_classes.rb

@@ -12,8 +12,8 @@ class x($y, $z) {
 class {x: y => '1', z => '2'}
 }
 
-apply_manifest_on(agents, manifest) do
-    fail_test "inclusion after parameterization failed" unless stdout.include? "1-2"
+apply_manifest_on(agents, manifest) do |result|
+    fail_test "inclusion after parameterization failed" unless result.stdout.include? "1-2"
 end
 
 ########################################################################
@@ -28,8 +28,8 @@ class {x: y => '1', z => '2'}
 include x
 }
 
-apply_manifest_on(agents, manifest) do
-    fail_test "inclusion after parameterization failed" unless stdout.include? "1-2"
+apply_manifest_on(agents, manifest) do |result|
+    fail_test "inclusion after parameterization failed" unless result.stdout.include? "1-2"
 end
 
 ########################################################################
@@ -41,8 +41,8 @@ class x($y, $z='2') {
 class {x: y => '1'}
 }
 
-apply_manifest_on(agents, manifest) do
-    fail_test "the default didn't apply as expected" unless stdout.include? "1-2"
+apply_manifest_on(agents, manifest) do |result|
+    fail_test "the default didn't apply as expected" unless result.stdout.include? "1-2"
 end
 
 ########################################################################
@@ -54,6 +54,6 @@ class x($y, $z='2') {
 class {x: y => '1', z => '3'}
 }
 
-apply_manifest_on(agents, manifest) do
-    fail_test "the override didn't happen as we expected" unless stdout.include? "1-3"
+apply_manifest_on(agents, manifest) do |result|
+    fail_test "the override didn't happen as we expected" unless result.stdout.include? "1-3"
 end

acceptance/tests/apply/classes/should_allow_param_override.rb

@@ -16,8 +16,8 @@ class child inherits parent {
 include child
 }
 
-apply_manifest_on(agents, manifest) do
+apply_manifest_on(agents, manifest) do |result|
     fail_test "parameter override didn't work" unless
-        stdout.include? "defined 'message' as 'child'"
+        result.stdout.include? "defined 'message' as 'child'"
 end
 

acceptance/tests/apply/classes/should_allow_param_undef_override.rb

@@ -30,9 +30,9 @@ class child inherits parent {
   step "apply the manifest"
   apply_manifest_on(agent, manifest)
   step "verify the file content"
-  on(agent, "cat #{out}") do
-    fail_test "the file was not touched" if stdout.include? "hello world!"
-    fail_test "the file was not updated" unless stdout.include? "hello new world"
+  on(agent, "cat #{out}") do |result|
+    fail_test "the file was not touched" if result.stdout.include? "hello world!"
+    fail_test "the file was not updated" unless result.stdout.include? "hello new world"
   end
 
   on(agent, "rm -rf #{dir}")

acceptance/tests/apply/classes/should_include_resources_from_class.rb

@@ -9,7 +9,6 @@ class x {
 }
 include x
 }
-apply_manifest_on(agents, manifest) do
-    fail_test "the resource did not apply" unless
-        stdout.include? "defined 'message' as 'a'"
+apply_manifest_on(agents, manifest) do |result|
+    fail_test "the resource did not apply" unless result.stdout.include?("defined 'message' as 'a'")
 end

acceptance/tests/apply/classes/should_not_auto_include_resources_from_class.rb

@@ -4,7 +4,7 @@
     'audit:unit'   # This should be covered at the unit layer.
 
 manifest = %q{ class x { notify { 'test': message => 'never invoked' } } }
-apply_manifest_on(agents, manifest) do
+apply_manifest_on(agents, manifest) do |result|
     fail_test "found the notify despite not including it" if
-        stdout.include? "never invoked"
+        result.stdout.include? "never invoked"
 end