diff options
| author | cprice <chris@puppetlabs.com> | 2012-03-27 10:38:38 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-03-29 16:25:09 -0700 |
| commit | 82194ca7e7c6fdf45db121a360e4dc125a8273b5 (patch) | |
| tree | f8df12a4ec009668ffb434f5034886fdffd5e675 | |
| parent | 10c793f8f0bca08a42237bddd18100e649e80df1 (diff) | |
(#13439) refactor spec helper for compatibility with both puppet 2.7 and
master
| -rw-r--r-- | spec/spec_helper.rb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 87aac34..d6837a9 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -65,22 +65,14 @@ RSpec.configure do |config| config.before :each do GC.disable - # these globals are set by Application - $puppet_application_mode = nil - $puppet_application_name = nil # REVISIT: I think this conceals other bad tests, but I don't have time to # fully diagnose those right now. When you read this, please come tell me # I suck for letting this float. --daniel 2011-04-21 Signal.stubs(:trap) - # Set the confdir and vardir to gibberish so that tests - # have to be correctly mocked. - Puppet[:confdir] = "/dev/null" - Puppet[:vardir] = "/dev/null" + Puppet.settings.send(:initialize_everything_for_tests) - # Avoid opening ports to the outside world - Puppet.settings[:bindaddress] = "127.0.0.1" @logs = [] Puppet::Util::Log.newdestination(Puppet::Test::LogCollector.new(@logs)) @@ -89,7 +81,7 @@ RSpec.configure do |config| end config.after :each do - Puppet.settings.clear + Puppet.settings.send(:clear_everything_for_tests) Puppet::Node::Environment.clear Puppet::Util::Storage.clear Puppet::Util::ExecutionStub.reset if Puppet::Util.constants.include? "ExecutionStub" |