summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-04-04 08:47:06 -0400
committerJeff McCune <jeff@puppetlabs.com>2012-04-04 08:47:06 -0400
commit40da421c0480f940638d0db9aabf180500d6ae5c (patch)
treebb0ffab0069cd8e27ad4788a0b3678a1b859ae52
parent69465b0f3e0c0c5284812bfa76ab8d3c254d10a9 (diff)
parent3222f35de86b681013df5d3d54c06fa670be871e (diff)
Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests' into 2.2.x
* eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests: (#13595) initialize_everything_for_tests couples modules Puppet ver
-rw-r--r--spec/spec_helper.rb4
1 files changed, 2 insertions, 2 deletions
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"