[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.5rc1-120-g2247c80

[Matt Robinson]

The following commit has been merged in the upstream branch:
commit 1ab9bd833237c7cf2036989a58a1b22d3cc49a5b
Merge: 8625dc960776bcf43e3c4910dcdf35fa39febea1 fd73874147a1aaa3a047f904a0bc1ae67780a2e4
Author: Matt Robinson <matt at puppetlabs.com>
Date:   Tue Feb 1 15:36:34 2011 -0800

    Merge branch 'ticket/2.6.next/6107' into 2.6.next
    
    * ticket/2.6.next/6107:
      (#6107) Fix an error when auditing a file with empty content

diff --combined spec/unit/type/file_spec.rb
index 27d6727,d5cde5f..90f3daf
--- a/spec/unit/type/file_spec.rb
+++ b/spec/unit/type/file_spec.rb
@@@ -823,73 -823,6 +823,73 @@@ describe Puppet::Type.type(:file) d
      end
    end
  
 +  describe "when specifying both source, and content properties" do
 +    before do
 +      @file[:source]  = '/one'
 +      @file[:content] = 'file contents'
 +    end
 +
 +    it "should raise an exception" do
 +      lambda {@file.validate }.should raise_error(/You cannot specify more than one of/)
 +    end
 +  end
 +
 +  describe "when using source" do
 +    before do
 +      @file[:source]   = '/one'
 +    end
 +    Puppet::Type::File::ParameterChecksum.value_collection.values.reject {|v| v == :none}.each do |checksum_type|
 +      describe "with checksum '#{checksum_type}'" do
 +        before do
 +          @file[:checksum] = checksum_type
 +        end
 +
 +        it 'should validate' do
 +
 +          lambda { @file.validate }.should_not raise_error
 +        end
 +      end
 +    end
 +
 +    describe "with checksum 'none'" do
 +      before do
 +        @file[:checksum] = :none
 +      end
 +
 +      it 'should raise an exception when validating' do
 +        lambda { @file.validate }.should raise_error(/You cannot specify source when using checksum 'none'/)
 +      end
 +    end
 +  end
 +
 +  describe "when using content" do
 +    before do
 +      @file[:content] = 'file contents'
 +    end
 +
 +    (Puppet::Type::File::ParameterChecksum.value_collection.values - SOURCE_ONLY_CHECKSUMS).each do |checksum_type|
 +      describe "with checksum '#{checksum_type}'" do
 +        before do
 +          @file[:checksum] = checksum_type
 +        end
 +
 +        it 'should validate' do
 +          lambda { @file.validate }.should_not raise_error
 +        end
 +      end
 +    end
 +
 +    SOURCE_ONLY_CHECKSUMS.each do |checksum_type|
 +      describe "with checksum '#{checksum_type}'" do
 +        it 'should raise an exception when validating' do
 +          @file[:checksum] = checksum_type
 +
 +          lambda { @file.validate }.should raise_error(/You cannot specify content when using checksum '#{checksum_type}'/)
 +        end
 +      end
 +    end
 +  end
 +
    describe "when returning resources with :eval_generate" do
      before do
        @graph = stub 'graph', :add_edge => nil
@@@ -1162,20 -1095,17 +1162,32 @@@
        transaction.report.resource_statuses["File[#{@path}]"].failed.should == false
        File.exists?(@path).should == true
      end
+ 
+     it "should not log errors if creating a new file with ensure present and no content" do
+       File.exists?(@path).should == false
+       file = Puppet::Type::File.new(:name => @path, :audit => "content", :ensure => "present")
+       catalog = Puppet::Resource::Catalog.new
+       catalog.add_resource(file)
+ 
+       Puppet::Util::Storage.stubs(:store) # to prevent the catalog from trying to write state.yaml
+ 
+       catalog.apply
+       @logs.reject {|l| l.level == :notice }.should be_empty
+     end
    end
 +
 +  describe "when specifying both source and checksum" do
 +    it 'should use the specified checksum when source is first' do
 +      @file[:source] = '/foo'
 +      @file[:checksum] = :md5lite
 +
 +      @file[:checksum].should be :md5lite
 +    end
 +    it 'should use the specified checksum when source is last' do
 +      @file[:checksum] = :md5lite
 +      @file[:source] = '/foo'
 +
 +      @file[:checksum].should be :md5lite
 +    end
 +  end
  end

-- 
Puppet packaging for Debian