[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[Nick Lewis]

The following commit has been merged in the upstream branch:
commit 2c88884f892a869b4111739c2c5ff40994e5ed87
Author: Nick Lewis <nick at puppetlabs.com>
Date:   Wed Jul 7 16:32:53 2010 -0700

    [#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.

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e7dd554..5d94f13 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 e188a23..917ad7d 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

-- 
Puppet packaging for Debian