opuppet/puppetlabs-stdlib
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch '2.2.x' into 2.3.x

Browse source 
* 2.2.x:
  (#13439) Fix test failures with Puppet 2.6.x
This commit is contained in:
Jeff McCune 2012-03-29 16:55:46 -07:00
commit 6065628493
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
spec/spec_helper.rb
View file

@ -69,7 +69,12 @@ RSpec.configure do |config|
# I suck for letting this float. --daniel 2011-04-21 # I suck for letting this float. --daniel 2011-04-21
Signal.stubs(:trap) Signal.stubs(:trap)
# We're using send because this is a private method to communicate it
# should only be used for tests. We're testing if it's defined to work
# with Puppet 2.6.x which does not have the method.
if Puppet.settings.private_methods.include? "initialize_everything_for_tests"
Puppet.settings.send(:initialize_everything_for_tests) Puppet.settings.send(:initialize_everything_for_tests)
end
@logs = [] @logs = []
@ -79,7 +84,12 @@ RSpec.configure do |config|
end end
config.after :each do config.after :each do
# We're using send because this is a private method to communicate it
# should only be used for tests. We're testing if it's defined to work
# with Puppet 2.6.x which does not have the method at all.
if Puppet.settings.private_methods.include? "clear_everything_for_tests"
Puppet.settings.send(:clear_everything_for_tests) Puppet.settings.send(:clear_everything_for_tests)
end
Puppet::Node::Environment.clear Puppet::Node::Environment.clear
Puppet::Util::Storage.clear Puppet::Util::Storage.clear
Puppet::Util::ExecutionStub.reset if Puppet::Util.constants.include? "ExecutionStub" Puppet::Util::ExecutionStub.reset if Puppet::Util.constants.include? "ExecutionStub"