From 98526d7c903349b52f80663fec97798673a6079f Mon Sep 17 00:00:00 2001 From: Justin Stoller Date: Wed, 2 Oct 2024 21:41:18 -0700 Subject: [PATCH] (maint) Update Compat tests for Beaker update This was missed in aeec8a3db. --- acceptance/suites/puppet4_tests/puppet4_version_test.rb | 8 ++++---- acceptance/suites/puppet5_tests/puppet5_version_test.rb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/acceptance/suites/puppet4_tests/puppet4_version_test.rb b/acceptance/suites/puppet4_tests/puppet4_version_test.rb index bc68bb23c..5b867548a 100644 --- a/acceptance/suites/puppet4_tests/puppet4_version_test.rb +++ b/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" diff --git a/acceptance/suites/puppet5_tests/puppet5_version_test.rb b/acceptance/suites/puppet5_tests/puppet5_version_test.rb index 9df618317..366752e00 100644 --- a/acceptance/suites/puppet5_tests/puppet5_version_test.rb +++ b/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"