Revert "Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_initialize_e...

This reverts commit 40da421c0480f940638d0db9aabf180500d6ae5c, reversing
changes made to 69465b0f3e0c0c5284812bfa76ab8d3c254d10a9.

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9f806e3a0188be4090df01becbbf75911e641c7a..92fe1ad565057db2ecc75339b1e32846099c208c 100644 (file)
--- 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"