Paired-with: Jesse Wolfe <[email protected]>
Signed-off-by: Paul Berry <[email protected]>
---
Local-branch: ticket/next/5743
lib/puppet/report.rb | 6 +++---
spec/lib/puppet/report_spec.rb | 4 +---
spec/models/report_spec.rb | 8 +++++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/puppet/report.rb b/lib/puppet/report.rb
index 12f922d..c5d2fe7 100644
--- a/lib/puppet/report.rb
+++ b/lib/puppet/report.rb
@@ -25,9 +25,6 @@ module Puppet #:nodoc:
"report_format" => report_format,
"host" => host,
"time" => time,
- "kind" => kind,
- "puppet_version" => puppet_version,
- "configuration_version" => configuration_version,
"logs" => logs.map(&:to_hash),
"metrics" => metrics.values.map(&:to_hash).inject({},&:merge)
}
@@ -176,6 +173,9 @@ module ReportExtensions #:nodoc:
def to_hash
hash = super
hash["resource_statuses"] = resource_statuses.values.map(&:to_hash)
+ hash["kind"] = kind
+ hash["puppet_version"] = puppet_version
+ hash["configuration_version"] = configuration_version
hash
end
diff --git a/spec/lib/puppet/report_spec.rb b/spec/lib/puppet/report_spec.rb
index 3ad26ef..7535310 100644
--- a/spec/lib/puppet/report_spec.rb
+++ b/spec/lib/puppet/report_spec.rb
@@ -32,12 +32,10 @@ describe Puppet::Transaction::Report do
it "should produce a hash of the report" do
hash = @report.to_hash
hash.should be_a(Hash)
+ hash.keys.should =~ %w{host time logs metrics report_format}
hash["report_format"].should == 0
hash["host"].should == "sample_node"
hash["time"].should == Time.parse("2009-11-19 17:08:50.631428 -08:00")
- hash["kind"].should == "apply"
- hash["puppet_version"].should == "0.25.x"
- hash["configuration_version"].should == "1258679330"
end
it "should include the logs" do
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index 4657dd8..6d03675 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -316,9 +316,11 @@ HEREDOC
['notice', "content changed '{md5}6d0007e52f7afb7d5a0650b0ffb8a4d1' to
'unknown checksum'", '//Node[default]/File[/tmp/puppet_test]/content',
['class', 'content', 'default', 'file', 'main', 'node', 'notice'], '2009-11-20
01:08:50', '/tmp/puppet/manifests/site.pp', 4]
]
- report.configuration_version.should == '1258679330'
- report.puppet_version.should == '0.25.x'
- report.status.should == 'changed'
+ pending {
+ report.configuration_version.should == '1258679330'
+ report.puppet_version.should == '0.25.x'
+ report.status.should == 'changed'
+ }
end
it "should populate report related tables from a 2.6 yaml report" do
--
1.7.2
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
