Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(205)

Unified Diff: chromium_step.py

Issue 200030: Show red/orange when shell or log steps fail/warn.... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/tools/buildbot/scripts/master/
Patch Set: Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromium_step.py
===================================================================
--- chromium_step.py (revision 25559)
+++ chromium_step.py (working copy)
@@ -126,18 +126,16 @@
return text_list
def evaluateCommand(self, cmd):
- result = None
-
- # If the log processor provides an evaluateCommand method, call it.
+ shell_result = shell.ShellCommand.evaluateCommand(self, cmd)
+ log_result = None
if self._log_processor and 'evaluateCommand' in dir(self._log_processor):
- result = self._log_processor.evaluateCommand(cmd)
+ log_result = self._log_processor.evaluateCommand(cmd)
+ if shell_result is builder.FAILURE or log_result is builder.FAILURE:
+ return builder.FAILURE
+ if shell_result is builder.WARNINGS or log_result is builder.WARNINGS:
+ return builder.WARNINGS
+ return builder.SUCCESS
- if result is None or result is builder.SUCCESS:
- # Report success of parent command.
- result = shell.ShellCommand.evaluateCommand(self, cmd)
-
- return result
-
def _CreateReportLinkIfNeccessary(self):
if self._log_processor.ReportLink():
self.addURL('results', "%s" % self._log_processor.ReportLink())
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698