diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2010-07-07 16:32:53 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2010-07-07 16:36:26 -0700 |
| commit | 2c88884f892a869b4111739c2c5ff40994e5ed87 (patch) | |
| tree | 944d7ecef2a80b5d59d6cc0d046ca0e6b63b5eaf | |
| parent | 4a6428b3e820876247b71ff1dcc6928946bb78ff (diff) | |
| download | puppet-2c88884f892a869b4111739c2c5ff40994e5ed87.tar.gz puppet-2c88884f892a869b4111739c2c5ff40994e5ed87.tar.xz puppet-2c88884f892a869b4111739c2c5ff40994e5ed87.zip | |
[#4114] Fixes test failures caused by previous 4114 fixes
An array was being used as a hash index, and still being pushed
to, making Log::close fail to find and close it.
| -rw-r--r-- | spec/spec_helper.rb | 1 | ||||
| -rwxr-xr-x | spec/unit/util/log_spec.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e7dd55482..5d94f130c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -66,6 +66,7 @@ Spec::Runner.configure do |config| $tmpfiles.clear end + @logs.clear Puppet::Util::Log.close_all end diff --git a/spec/unit/util/log_spec.rb b/spec/unit/util/log_spec.rb index e188a2366..917ad7dab 100755 --- a/spec/unit/util/log_spec.rb +++ b/spec/unit/util/log_spec.rb @@ -87,7 +87,7 @@ describe Puppet::Util::Log do it "should flush the log queue when the first destination is specified" do Puppet::Util::Log.close_all Puppet::Util::Log.expects(:flushqueue) - Puppet::Util::Log.newdestination(:array) + Puppet::Util::Log.newdestination([]) end it "should convert the level to a symbol if it's passed in as a string" do |