[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 76953d818892506ec4cb3ab2c4dd7048364a08cd
Author: Nick Lewis <nick at puppetlabs.com>
Date:   Mon Jun 28 14:00:22 2010 -0700

    maint: Fixes broken order-dependent Tidy specs
    
    A few specs were using a global variable rather than a local, causing
    an order-dependent failure in which they were replacing the object
    under test.

diff --git a/spec/unit/type/tidy_spec.rb b/spec/unit/type/tidy_spec.rb
index 7e51189..1b2f497 100755
--- a/spec/unit/type/tidy_spec.rb
+++ b/spec/unit/type/tidy_spec.rb
@@ -98,9 +98,9 @@ describe tidy do
 
         convertors.each do |unit, multiple|
             it "should consider a %s to be %s seconds" % [unit, multiple] do
-                tidy = Puppet::Type.type(:tidy).new :path => @basepath, :age => "5%s" % unit.to_s[0..0]
+                @tidy = Puppet::Type.type(:tidy).new :path => @basepath, :age => "5%s" % unit.to_s[0..0]
 
-                tidy[:age].should == 5 * multiple
+                @tidy[:age].should == 5 * multiple
             end
         end
     end
@@ -115,11 +115,11 @@ describe tidy do
 
         convertors.each do |unit, multiple|
             it "should consider a %s to be 1024^%s bytes" % [unit, multiple] do
-                tidy = Puppet::Type.type(:tidy).new :path => @basepath, :size => "5%s" % unit
+                @tidy = Puppet::Type.type(:tidy).new :path => @basepath, :size => "5%s" % unit
 
                 total = 5
                 multiple.times { total *= 1024 }
-                tidy[:size].should == total
+                @tidy[:size].should == total
             end
         end
     end

-- 
Puppet packaging for Debian