Merge pull request #2888 from justinstoller/fixup-compat-tests

(maint) Update Compat tests for Beaker update

Author: justinstoller

acceptance/suites/puppet4_tests/puppet4_version_test.rb

@@ -4,13 +4,13 @@
 legacy_agents = agents.reject { |agent| agent == master }
 
 step "Check that legacy agents have Puppet 4.x installed"
-on(legacy_agents, puppet("--version")) do
-  assert_match(/\A4\./, stdout, "puppet --version does not start with major version 4.")
+on(legacy_agents, puppet("--version")) do |result|
+  assert_match(/\A4\./, result.stdout, "puppet --version does not start with major version 4.")
 end
 
 step "Check that Puppet Server has Puppet 6.x installed"
-on(master, puppet("--version")) do
-  assert_match(/\A6/, stdout, "puppet --version does not start with major version 6.x")
+on(master, puppet("--version")) do |result|
+  assert_match(/\A6/, result.stdout, "puppet --version does not start with major version 6.x")
 end
 
 step "Check that the agent on the master runs against the master"

acceptance/suites/puppet5_tests/puppet5_version_test.rb

@@ -4,13 +4,13 @@
 legacy_agents = agents.reject { |agent| agent == master }
 
 step "Check that legacy agents have Puppet 5.x installed"
-on(legacy_agents, puppet("--version")) do
-  assert_match(/\A5\./, stdout, "puppet --version does not start with major version 5.")
+on(legacy_agents, puppet("--version")) do |result|
+  assert_match(/\A5\./, result.stdout, "puppet --version does not start with major version 5.")
 end
 
 step "Check that Puppet Server has Puppet 8.x installed"
-on(master, puppet("--version")) do
-  assert_match(/\A8/, stdout, "puppet --version does not start with major version 8.x")
+on(master, puppet("--version")) do |result|
+  assert_match(/\A8/, result.stdout, "puppet --version does not start with major version 8.x")
 end
 
 step "Check that the agent on the master runs against the master"