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

[Markus Roberts]

The following commit has been merged in the upstream branch:
commit 7c7f6da17c4f088175e7d616e390b5c7e1e5e65f
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Thu Jul 1 16:28:26 2010 -0700

    maint: file_spec heisenbugs
    
    Puppet::Util::Storage was trying to create state.yaml during unrelated
    specs.

diff --git a/spec/integration/type/file_spec.rb b/spec/integration/type/file_spec.rb
index 47a5487..f215f0b 100755
--- a/spec/integration/type/file_spec.rb
+++ b/spec/integration/type/file_spec.rb
@@ -7,6 +7,11 @@ require 'puppet_spec/files'
 describe Puppet::Type.type(:file) do
     include PuppetSpec::Files
 
+    before do
+        # stub this to not try to create state.yaml
+        Puppet::Util::Storage.stubs(:store)
+    end
+
     it "should not attempt to manage files that do not exist if no means of creating the file is specified" do
         file = Puppet::Type.type(:file).new :path => "/my/file", :mode => "755"
         catalog = Puppet::Resource::Catalog.new
@@ -128,6 +133,8 @@ describe Puppet::Type.type(:file) do
 
         it "should propagate failures encountered when renaming the temporary file" do
             file = Puppet::Type.type(:file).new :path => tmpfile("fail_rename"), :content => "foo"
+            file.stubs(:remove_existing) # because it tries to make a backup
+
             catalog = Puppet::Resource::Catalog.new
             catalog.add_resource file
 

-- 
Puppet packaging for Debian