(PA-5781) Update stdout and stderr methods for Beaker 5

This commit updates stderr and stdout methods to be called on Result
objects and removes _ in front of variables that are used.

Previously in Beaker, you could use standalone stdout and stderr methods
to access output from remote machines.

These methods were deprecated in 2013 with voxpupuli/beaker@28b2510 and
dropped entirely in voxpupuli/beaker@73a31c7.

Author: AriaXLi

spec/acceptance/tests/resource/ssh_authorized_key/create_spec.rb

@@ -30,8 +30,8 @@
               "key='mykey'"]
       on(agent, puppet_resource('ssh_authorized_key', name.to_s, args))
 
-      on(agent, "cat #{auth_keys}") do |_res|
-        fail_test "didn't find the ssh_authorized_key for #{name}" unless stdout.include? name.to_s
+      on(agent, "cat #{auth_keys}") do |res|
+        fail_test "didn't find the ssh_authorized_key for #{name}" unless res.stdout.include? name.to_s
       end
     end
 
@@ -44,8 +44,8 @@
               "target='#{custom_key}'"]
       on(agent, puppet_resource('ssh_authorized_key', name.to_s, args))
 
-      on(agent, "cat #{custom_key}") do |_res|
-        fail_test "didn't find the ssh_authorized_key for #{name}" unless stdout.include? name.to_s
+      on(agent, "cat #{custom_key}") do |res|
+        fail_test "didn't find the ssh_authorized_key for #{name}" unless res.stdout.include? name.to_s
       end
       on(agent, "rm -rf #{custom_key_directory}")
     end
@@ -64,8 +64,8 @@
               "key='mykey'",
               'drop_privileges=false',
               "target=/home/testuser/tmp/ssh_authorized_keys_#{name}/authorized_keys_#{name}"]
-      on(agent, puppet_resource('ssh_authorized_key', name.to_s, args)) do |_res|
-        fail_test unless stderr.include?('the target path is not trusted')
+      on(agent, puppet_resource('ssh_authorized_key', name.to_s, args)) do |res|
+        fail_test unless res.stderr.include?('the target path is not trusted')
       end
       on(agent, "rm -rf #{custom_key_directory}")
 
@@ -80,8 +80,8 @@
               "key='mykey'",
               'drop_privileges=false',
               "target='#{custom_key}'"]
-      on(agent, puppet_resource('ssh_authorized_key', name.to_s, args), acceptable_exit_codes: [0, 1]) do |_res|
-        fail_test unless stderr.include?('the target path is not trusted')
+      on(agent, puppet_resource('ssh_authorized_key', name.to_s, args), acceptable_exit_codes: [0, 1]) do |res|
+        fail_test unless res.stderr.include?('the target path is not trusted')
       end
     end
   end

spec/acceptance/tests/resource/ssh_authorized_key/destroy_spec.rb

@@ -31,8 +31,8 @@
               "key='mykey'"]
       on(agent, puppet_resource('ssh_authorized_key', name.to_s, args))
 
-      on(agent, "cat #{auth_keys}") do |_res|
-        expect(stdout).not_to include(name.to_s)
+      on(agent, "cat #{auth_keys}") do |res|
+        expect(res.stdout).not_to include(name.to_s)
       end
     end
 
@@ -46,8 +46,8 @@
               "target='#{custom_key}'"]
       on(agent, puppet_resource('ssh_authorized_key', name.to_s, args))
 
-      on(agent, "cat #{custom_key}") do |_res|
-        expect(stdout).not_to include(name.to_s)
+      on(agent, "cat #{custom_key}") do |res|
+        expect(res.stdout).not_to include(name.to_s)
       end
       on(agent, "rm -rf #{custom_key_directory}")
     end

spec/acceptance/tests/resource/ssh_authorized_key/modify_spec.rb

@@ -29,9 +29,9 @@
               "key='mynewshinykey'"]
       on(agent, puppet_resource('ssh_authorized_key', name.to_s, args))
 
-      on(agent, "cat #{auth_keys}") do |_res|
-        expect(stdout).to include("mynewshinykey #{name}")
-        expect(stdout).not_to include("mykey #{name}")
+      on(agent, "cat #{auth_keys}") do |res|
+        expect(res.stdout).to include("mynewshinykey #{name}")
+        expect(res.stdout).not_to include("mykey #{name}")
       end
     end
 
@@ -45,9 +45,9 @@
               "target='#{custom_key}'"]
       on(agent, puppet_resource('ssh_authorized_key', name.to_s, args))
 
-      on(agent, "cat #{custom_key}") do |_res|
-        expect(stdout).to include("mynewshinykey #{name}")
-        expect(stdout).not_to include("mykey #{name}")
+      on(agent, "cat #{custom_key}") do |res|
+        expect(res.stdout).to include("mynewshinykey #{name}")
+        expect(res.stdout).not_to include("mykey #{name}")
       end
       on(agent, "rm -rf #{custom_key_directory}")
     end

spec/acceptance/tests/resource/sshkey/create_spec.rb

@@ -66,8 +66,8 @@
       ]
       on(agent, puppet_resource('sshkey', keyname.to_s, args))
 
-      on(agent, "cat #{ssh_known_hosts}") do |_rc|
-        expect(stdout).to include(keyname.to_s)
+      on(agent, "cat #{ssh_known_hosts}") do |res|
+        expect(res.stdout).to include(keyname.to_s)
       end
     end
   end
@@ -98,9 +98,9 @@
       }
 MANIFEST
 
-      on(agent, "cat #{ssh_known_hosts}") do |_rc|
-        expect(stdout).to include("#{keyname} ssh-rsa")
-        expect(stdout).to include("#{keyname} ssh-dss")
+      on(agent, "cat #{ssh_known_hosts}") do |res|
+        expect(res.stdout).to include("#{keyname} ssh-rsa")
+        expect(res.stdout).to include("#{keyname} ssh-dss")
       end
     end
   end

spec/acceptance/tests/resource/sshkey/destroy_spec.rb

@@ -56,8 +56,8 @@
               "type='rsa'"]
       on(agent, puppet_resource('sshkey', keyname.to_s, args))
 
-      on(agent, "cat #{ssh_known_hosts}") do |_res|
-        expect(stdout).not_to include('how_about_the_initial_rsa_key_of_c')
+      on(agent, "cat #{ssh_known_hosts}") do |res|
+        expect(res.stdout).not_to include('how_about_the_initial_rsa_key_of_c')
       end
     end
 
@@ -66,8 +66,8 @@
               "type='ssh-dss'"]
       on(agent, puppet_resource('sshkey', keyname.to_s, args))
 
-      on(agent, "cat #{ssh_known_hosts}") do |_res|
-        expect(stdout).not_to include('how_about_the_initial_dss_key_of_c')
+      on(agent, "cat #{ssh_known_hosts}") do |res|
+        expect(res.stdout).not_to include('how_about_the_initial_dss_key_of_c')
       end
     end
   end

spec/acceptance/tests/resource/sshkey/modify_spec.rb

@@ -57,9 +57,9 @@
               "key='how_about_the_updated_rsa_key_of_c'"]
       on(agent, puppet_resource('sshkey', keyname.to_s, args))
 
-      on(agent, "cat #{ssh_known_hosts}") do |_res|
-        expect(stdout).to include('how_about_the_updated_rsa_key_of_c')
-        expect(stdout).not_to include('how_about_the_initial_rsa_key_of_c')
+      on(agent, "cat #{ssh_known_hosts}") do |res|
+        expect(res.stdout).to include('how_about_the_updated_rsa_key_of_c')
+        expect(res.stdout).not_to include('how_about_the_initial_rsa_key_of_c')
       end
     end
 
@@ -69,9 +69,9 @@
               "key='how_about_the_updated_dss_key_of_c'"]
       on(agent, puppet_resource('sshkey', keyname.to_s, args))
 
-      on(agent, "cat #{ssh_known_hosts}") do |_res|
-        expect(stdout).to include('how_about_the_updated_dss_key_of_c')
-        expect(stdout).not_to include('how_about_the_initial_dss_key_of_c')
+      on(agent, "cat #{ssh_known_hosts}") do |res|
+        expect(res.stdout).to include('how_about_the_updated_dss_key_of_c')
+        expect(res.stdout).not_to include('how_about_the_initial_dss_key_of_c')
       end
     end
   end

spec/acceptance/tests/resource/sshkey/purge_spec.rb

@@ -65,8 +65,8 @@
       # expect purging to be idempotent
       apply_manifest_on(agent, purge_manifest, catch_changes: true)
 
-      on(agent, "cat #{ssh_known_hosts}") do |_res|
-        expect(stdout).not_to include('how_about_the_initial')
+      on(agent, "cat #{ssh_known_hosts}") do |res|
+        expect(res.stdout).not_to include('how_about_the_initial')
       end
     end
   end