summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@reductivelabs.com>2010-03-23 10:41:15 -0700
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commit9d9b20f4e6d4bd3501033d58b0e93411e40a147a (patch)
tree9d2af8646dcb33c8443f8bee7418516b8b4f3b60
parenteb0a4b5833476b51417a7047b5fb6e05843ff05b (diff)
downloadpuppet-9d9b20f4e6d4bd3501033d58b0e93411e40a147a.tar.gz
puppet-9d9b20f4e6d4bd3501033d58b0e93411e40a147a.tar.xz
puppet-9d9b20f4e6d4bd3501033d58b0e93411e40a147a.zip
Fixing Configurer interface to transaction report
Signed-off-by: Luke Kanies <luke@reductivelabs.com>
-rw-r--r--lib/puppet/configurer.rb2
-rwxr-xr-xspec/unit/configurer.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/configurer.rb b/lib/puppet/configurer.rb
index 8179d2c4d..aa336b462 100644
--- a/lib/puppet/configurer.rb
+++ b/lib/puppet/configurer.rb
@@ -194,7 +194,7 @@ class Puppet::Configurer
end
def send_report(report, trans = nil)
- trans.add_metrics_to_report(report) if trans
+ trans.generate_report if trans
puts report.summary if Puppet[:summarize]
report.save() if Puppet[:report]
rescue => detail
diff --git a/spec/unit/configurer.rb b/spec/unit/configurer.rb
index 03ef188c9..9fc46affd 100755
--- a/spec/unit/configurer.rb
+++ b/spec/unit/configurer.rb
@@ -236,7 +236,7 @@ describe Puppet::Configurer, "when sending a report" do
end
it "should use any provided transaction to add metrics to the report" do
- @trans.expects(:add_metrics_to_report).with(@report)
+ @trans.expects(:generate_report)
@configurer.send_report(@report, @trans)
end