Skip to content

Commit

Permalink
fix flaky test
Browse files Browse the repository at this point in the history
buildbot.test.integration.test_stop_trigger.TriggeringMaster.testTriggerRunsForever
when a build is cancelled early, self.rendered is not set

Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
  • Loading branch information
Pierre Tardy committed May 16, 2015
1 parent c5c5180 commit 65b1a04
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions master/buildbot/steps/shell.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ def _describe(self, done=False):
return None

def describe(self, done=False):
if self.stopped and not self.rendered:
return u"stopped early"
assert(self.rendered)
desc = self._describe(done)
if not desc:
Expand Down

0 comments on commit 65b1a04

Please sign in to comment.