summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/puppet/resource/status.rb3
-rwxr-xr-xspec/unit/transaction/resource_harness.rb8
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/puppet/resource/status.rb b/lib/puppet/resource/status.rb
index ab088fb19..87c6161a6 100644
--- a/lib/puppet/resource/status.rb
+++ b/lib/puppet/resource/status.rb
@@ -24,6 +24,9 @@ class Puppet::Resource::Status
def add_event(event)
@events << event
+ if event.status == 'failure'
+ self.failed = true
+ end
end
def events
diff --git a/spec/unit/transaction/resource_harness.rb b/spec/unit/transaction/resource_harness.rb
index f69b560f8..2abec3cc0 100755
--- a/spec/unit/transaction/resource_harness.rb
+++ b/spec/unit/transaction/resource_harness.rb
@@ -204,14 +204,14 @@ describe Puppet::Transaction::ResourceHarness do
describe "when applying changes" do
before do
- @change1 = stub 'change1', :apply => stub("event")
- @change2 = stub 'change2', :apply => stub("event")
+ @change1 = stub 'change1', :apply => stub("event", :status => "success")
+ @change2 = stub 'change2', :apply => stub("event", :status => "success")
@changes = [@change1, @change2]
end
it "should apply the change" do
- @change1.expects(:apply)
- @change2.expects(:apply)
+ @change1.expects(:apply).returns( stub("event", :status => "success") )
+ @change2.expects(:apply).returns( stub("event", :status => "success") )
@harness.apply_changes(@status, @changes)
end