From c5686d7b0e09becc745a1d55a061a3a49a2863fa Mon Sep 17 00:00:00 2001 From: Kylo Ginsberg Date: Wed, 13 Apr 2016 12:02:10 -0700 Subject: [PATCH] Revert "(PUP-5737) Backport test fix from a pe-puppet fork" This reverts commit e623253792810533ba7df72c204b3fcf76851d98. Note that the backported test fix actually breaks puppet testing because of PUP-4755. The only impetus to backport was to minimize branch drift, but that is unlikely to happen given that there is no active develoment on 3.x. --- acceptance/setup/common/pre-suite/100_SetParser.rb | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/acceptance/setup/common/pre-suite/100_SetParser.rb b/acceptance/setup/common/pre-suite/100_SetParser.rb index 0495811fbc7..604a1cebd2c 100644 --- a/acceptance/setup/common/pre-suite/100_SetParser.rb +++ b/acceptance/setup/common/pre-suite/100_SetParser.rb @@ -11,18 +11,7 @@ # otherwise the setting is created outside of any section # which makes it appear future parser is not enabled. puppet_conf = host.puppet['config'] - on(host, "grep '[main]' #{puppet_conf}", :acceptable_exit_codes => [0,1,2]) do |result| - case result.exit_code - when 0 - # there is an assumption here that if a [main] section is present, it - # has settings otherwise PUP-4755 comes back into play, though - # 'global' settings should still end up in main when Puppet parses - on(host, puppet("config set --section main parser #{parser}")) - else - # not found (1), or file not present (2) - on(host, "echo \"[main]\nparser=future\n\" >> '#{puppet_conf}'") - end - end + on(host, "echo \"[main]\nparser=future\n\" >> '#{puppet_conf}'") end end end