summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Bradley <rick@rickbradley.com>2007-10-04 11:25:16 -0500
committerRick Bradley <rick@rickbradley.com>2007-10-04 11:25:16 -0500
commit1ea34a227ad75df853045f579e80cb455ca3dd5c (patch)
tree5d854d8ee03a0d85b5efb3563ec6a9c63924f7da
parent92d23e0398ffbaf7e264bb7ff716bd6f83130b07 (diff)
parente5c623e6d49704e313bc1a77b6a02ac6c92c7a2b (diff)
downloadpuppet-1ea34a227ad75df853045f579e80cb455ca3dd5c.tar.gz
puppet-1ea34a227ad75df853045f579e80cb455ca3dd5c.tar.xz
puppet-1ea34a227ad75df853045f579e80cb455ca3dd5c.zip
Merge branch 'master' of git://reductivelabs.com/puppet into routing
-rwxr-xr-xspec/unit/node/configuration.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/unit/node/configuration.rb b/spec/unit/node/configuration.rb
index 6893c8581..6b0677973 100755
--- a/spec/unit/node/configuration.rb
+++ b/spec/unit/node/configuration.rb
@@ -300,12 +300,14 @@ describe Puppet::Node::Configuration, " when applying host configurations" do
it "should send a report if reporting is enabled" do
Puppet[:report] = true
@transaction.expects :send_report
+ @transaction.stubs :any_failed? => false
@config.apply
end
it "should send a report if report summaries are enabled" do
Puppet[:summarize] = true
@transaction.expects :send_report
+ @transaction.stubs :any_failed? => false
@config.apply
end
@@ -319,6 +321,7 @@ describe Puppet::Node::Configuration, " when applying host configurations" do
it "should sync the state database after applying" do
Puppet::Util::Storage.expects(:store)
+ @transaction.stubs :any_failed? => false
@config.apply
end