From 3222f35de86b681013df5d3d54c06fa670be871e Mon Sep 17 00:00:00 2001 From: Eric Shamow Date: Tue, 3 Apr 2012 23:26:36 -0400 Subject: (#13595) initialize_everything_for_tests couples modules Puppet ver Replace regex used in spec_helper.rb to disallow both Puppet 2.6 and any 2.7 prior to 13. --- spec/spec_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 92fe1ad..9f806e3 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -73,7 +73,7 @@ RSpec.configure do |config| # We're using send because this is a private method to communicate it # should only be used for tests. Puppet 2.6.x does not have the method. - Puppet.settings.send(:initialize_everything_for_tests) unless Puppet.version =~ /^2\.6/ + Puppet.settings.send(:initialize_everything_for_tests) unless Puppet.version =~ /^(2\.6|2\.7\.[0-9][^3-9])/ @logs = [] @@ -85,7 +85,7 @@ RSpec.configure do |config| config.after :each do # We're using send because this is a private method to communicate it # should only be used for tests. Puppet 2.6.x does not have the method. - Puppet.settings.send(:clear_everything_for_tests) unless Puppet.version =~ /^2\.6/ + Puppet.settings.send(:clear_everything_for_tests) unless Puppet.version =~ /^(2\.6|2\.7\.[0-9][^3-9])/ Puppet::Node::Environment.clear Puppet::Util::Storage.clear Puppet::Util::ExecutionStub.reset if Puppet::Util.constants.include? "ExecutionStub" -- cgit v1.2.3