(#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.
This commit is contained in:
parent
69465b0f3e
commit
3222f35de8
1 changed files with 2 additions and 2 deletions
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue