[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 df653045aee21ae53e0e94d47e0edbdaf308fbf5
Author: Matt Robinson <matt at puppetlabs.com>
Date:   Thu Jan 6 11:24:18 2011 -0800

    maint: Inspect reports should have audited = true on events
    
    Paired-with: Jesse Wolfe

diff --git a/lib/puppet/application/inspect.rb b/lib/puppet/application/inspect.rb
index c7be893..07ee4c3 100644
--- a/lib/puppet/application/inspect.rb
+++ b/lib/puppet/application/inspect.rb
@@ -65,7 +65,13 @@ class Puppet::Application::Inspect < Puppet::Application
         next if audited_resource[name].nil?
         # Skip :absent properties of :absent resources. Really, it would be nicer if the RAL returned nil for those, but it doesn't. ~JW
         if name == :ensure or audited_resource[:ensure] != :absent or audited_resource[name] != :absent
-          event = ral_resource.event(:previous_value => audited_resource[name], :property => name, :status => "audit", :message => "inspected value is #{audited_resource[name].inspect}")
+          event = ral_resource.event(
+            :previous_value => audited_resource[name],
+            :property       => name,
+            :status         => "audit",
+            :audited        => true,
+            :message        => "inspected value is #{audited_resource[name].inspect}"
+          )
           status.add_event(event)
         end
       end
diff --git a/spec/unit/application/inspect_spec.rb b/spec/unit/application/inspect_spec.rb
index b931708..b3224d5 100644
--- a/spec/unit/application/inspect_spec.rb
+++ b/spec/unit/application/inspect_spec.rb
@@ -72,6 +72,26 @@ describe Puppet::Application::Inspect do
       properties.has_key?("target").should == false
     end
 
+    it "should set audited to true for all events" do
+      catalog = Puppet::Resource::Catalog.new
+      file = Tempfile.new("foo")
+      resource = Puppet::Resource.new(:file, file.path, :parameters => {:audit => "all"})
+      catalog.add_resource(resource)
+      Puppet::Resource::Catalog::Yaml.any_instance.stubs(:find).returns(catalog)
+
+      events = nil
+
+      Puppet::Transaction::Report::Rest.any_instance.expects(:save).with do |request|
+        events = request.instance.resource_statuses.values.first.events
+      end
+
+      @inspect.run_command
+
+      events.each do |event|
+        event.audited.should == true
+      end
+    end
+
     it "should not report irrelevent attributes if the resource is absent" do
       catalog = Puppet::Resource::Catalog.new
       file = Tempfile.new("foo")

-- 
Puppet packaging for Debian