summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-03-29 16:54:42 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-03-29 16:54:42 -0700
commitd22fbe32cd626091b32c8a0c0a8c83771a0c999a (patch)
tree905d915d405a914b4cc601b690314bec261c8ac2
parentcbdffb711fb109628ecdada9083f064b2e8d3a64 (diff)
parent665610baaf052a4b7b1c73682b9183ea743f2593 (diff)
downloadpuppet-stdlib-d22fbe32cd626091b32c8a0c0a8c83771a0c999a.tar.gz
puppet-stdlib-d22fbe32cd626091b32c8a0c0a8c83771a0c999a.tar.bz2
Merge branch 'ticket/2.2.x/13439_fix_spec_helper_try2' into 2.2.x
* ticket/2.2.x/13439_fix_spec_helper_try2: (#13439) Fix test failures with Puppet 2.6.x
-rw-r--r--spec/spec_helper.rb14
1 files changed, 12 insertions, 2 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index d6837a9..d0b493e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -71,7 +71,12 @@ RSpec.configure do |config|
# I suck for letting this float. --daniel 2011-04-21
Signal.stubs(:trap)
- Puppet.settings.send(:initialize_everything_for_tests)
+ # 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)
+ end
@logs = []
@@ -81,7 +86,12 @@ RSpec.configure do |config|
end
config.after :each do
- Puppet.settings.send(:clear_everything_for_tests)
+ # 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)
+ end
Puppet::Node::Environment.clear
Puppet::Util::Storage.clear
Puppet::Util::ExecutionStub.reset if Puppet::Util.constants.include? "ExecutionStub"