[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1601-gf8c1b08

[James Turnbull]

The following commit has been merged in the upstream branch:
commit b185801835cd656a8c3bab7654a8dddd2a74dba4
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Mon Dec 21 13:08:02 2009 -0800

    Fixing #2960 Test Failed: 'Puppet::Type::Mount::ProviderParsed when modifying the filesystem tab should write the mount to disk when :flush is called
    
    I found this doing idempotency tests (#2879), but there are apparently
    other ways for external state to leak into this test, as reported by
    James.
    
    Signed-off-by: Jesse Wolfe <jes5199 at gmail.com>

diff --git a/spec/unit/provider/mount/parsed.rb b/spec/unit/provider/mount/parsed.rb
index cf9feaa..10329e4 100755
--- a/spec/unit/provider/mount/parsed.rb
+++ b/spec/unit/provider/mount/parsed.rb
@@ -140,10 +140,12 @@ describe provider_class do
         end
 
         it "should write the mount to disk when :flush is called" do
+            old_text = @provider_class.target_object(@provider_class.default_target).read
+            
             @mount.flush
 
             text = @provider_class.target_object(@provider_class.default_target).read
-            text.should == @mount.class.to_line(@mount.property_hash) + "\n"
+            text.should == old_text + @mount.class.to_line(@mount.property_hash) + "\n"
         end
     end
 

-- 
Puppet packaging for Debian