diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-03-29 23:20:32 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-03-29 23:20:32 -0700 |
| commit | 56092811b5c12725be3652534a59334303719608 (patch) | |
| tree | 0a5d35af136796a5cd870191be9f6d7daea8fac6 /spec | |
| parent | 6065628493e775e3e6ddb59f272bd36a9e9fe072 (diff) | |
| parent | 69465b0f3e0c0c5284812bfa76ab8d3c254d10a9 (diff) | |
Merge branch '2.2.x' into 2.3.x
* 2.2.x:
(#13439) Fix MRI 1.9 issue with spec_helper
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/spec_helper.rb | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9c69b53..0f3248b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -70,11 +70,8 @@ RSpec.configure do |config| 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) - end + # 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/ @logs = [] @@ -85,11 +82,8 @@ 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. 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 + # 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::Node::Environment.clear Puppet::Util::Storage.clear Puppet::Util::ExecutionStub.reset if Puppet::Util.constants.include? "ExecutionStub" |