diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-04-04 08:56:35 -0400 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-04-04 08:56:35 -0400 |
| commit | 98aa06468ae5aba6673778feee0fa6d0a1df0e92 (patch) | |
| tree | 37e317b247770df92325bb7539b4a7cf76144d45 | |
| parent | 40da421c0480f940638d0db9aabf180500d6ae5c (diff) | |
Revert "Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests' into 2.2.x"
This reverts commit 40da421c0480f940638d0db9aabf180500d6ae5c, reversing
changes made to 69465b0f3e0c0c5284812bfa76ab8d3c254d10a9.
| -rw-r--r-- | spec/spec_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9f806e3..92fe1ad 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|2\.7\.[0-9][^3-9])/ + Puppet.settings.send(:initialize_everything_for_tests) unless Puppet.version =~ /^2\.6/ @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|2\.7\.[0-9][^3-9])/ + Puppet.settings.send(:clear_everything_for_tests) unless Puppet.version =~ /^2\.6/ Puppet::Node::Environment.clear Puppet::Util::Storage.clear Puppet::Util::ExecutionStub.reset if Puppet::Util.constants.include? "ExecutionStub" |