Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert "Merge remote-tracking branch 'eshamow/tickets/bug/13595_restr…

…ict_initialize_everything_for_tests' into 2.2.x"

This reverts commit 40da421, reversing
changes made to 69465b0.
  • Loading branch information...
commit 98aa06468ae5aba6673778feee0fa6d0a1df0e92 1 parent 40da421
@jeffmccune jeffmccune authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 spec/spec_helper.rb
View
4 spec/spec_helper.rb
@@ -73,7 +73,7 @@ def handle(msg)
# 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 @@ def handle(msg)
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"

0 comments on commit 98aa064

Please sign in to comment.
Something went wrong with that request. Please try again.