Bug 1090733 - xpcshell tests fail if no terminal configured. r=chmanchester
authorMark Hammond <mhammond@skippinet.com.au>
Thu, 30 Oct 2014 12:13:34 +1100
changeset 213038 e1e7603c2455d33cbbf4660ab92af33c8b98cad8
parent 213037 4cb91f2c872c566bd0250dcda5271612f53ac5b8
child 213039 e82273c162bf9e7fc764d426a217994c31b702b9
push id27738
push usercbook@mozilla.com
push dateThu, 30 Oct 2014 13:46:07 +0000
treeherdermozilla-central@1aa1b23d799e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1090733
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1090733 - xpcshell tests fail if no terminal configured. r=chmanchester
testing/mozbase/mozlog/mozlog/structured/formatters/machformatter.py
--- a/testing/mozbase/mozlog/mozlog/structured/formatters/machformatter.py
+++ b/testing/mozbase/mozlog/mozlog/structured/formatters/machformatter.py
@@ -237,18 +237,19 @@ class MachFormatter(base.BaseFormatter):
             self.status_buffer[test]["pass"] += 1
 
         self._update_summary(data)
 
         rv = None
         status, subtest = data["status"], data["subtest"]
         unexpected = "expected" in data
         if self.verbose:
-            color = self.terminal.red if unexpected else self.terminal.green
-            rv = " ".join([subtest, color(status), message])
+            if self.terminal is not None:
+                status = (self.terminal.red if unexpected else self.terminal.green)(status)
+            rv = " ".join([subtest, status, message])
         elif unexpected:
             # We only append an unexpected summary if it was not logged
             # directly by verbose mode.
             self.status_buffer[test]["unexpected"].append((subtest,
                                                            status,
                                                            data["expected"],
                                                            message))
         return rv