Index: scripts/master/chromium_step.py |
diff --git a/scripts/master/chromium_step.py b/scripts/master/chromium_step.py |
index 4cb34f19df59a16eb86669579590b76934970006..5cfc6285827f7a44dad2feae8dacd7dbad95b988 100644 |
--- a/scripts/master/chromium_step.py |
+++ b/scripts/master/chromium_step.py |
@@ -685,8 +685,19 @@ class AnnotatedCommand(ProcessLogShellStep): |
self.script_observer = AnnotationObserver(self) |
self.addLogObserver('stdio', self.script_observer) |
+ def _removePreamble(self): |
+ """Remove preamble if there is only section. |
+ |
+ 'stdio' will be identical to 'preamble' if there is only one annotator |
+ section, so it's redundant to show both on the waterfall. |
+ """ |
+ if len(self.script_observer.sections) == 1: |
+ self.step_status.logs = [x for x in self.step_status.logs if |
+ x.name != 'preamble'] |
+ |
def interrupt(self, reason): |
self.script_observer.fixupLast(builder.EXCEPTION) |
+ self._removePreamble() |
return ProcessLogShellStep.interrupt(self, reason) |
def evaluateCommand(self, cmd): |
@@ -697,6 +708,7 @@ class AnnotatedCommand(ProcessLogShellStep): |
def commandComplete(self, cmd): |
self.script_observer.handleReturnCode(cmd.rc) |
+ self._removePreamble() |
return ProcessLogShellStep.commandComplete(self, cmd) |