Bug 1270144 - use error() rather than warning() in order to ensure this shows up on the treeherder summary, rs=emorley-over-irc
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Wed, 25 May 2016 15:14:56 +0100
changeset 337973 e2f558143b0b39cec662497990322b4968494900
parent 337972 fd985ed46ae441ede84b789a476d30a8428217c7
child 337974 e24bac891d7d00c4a71cec12e152b65eb95349af
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersemorley-over-irc
bugs1270144
milestone49.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 1270144 - use error() rather than warning() in order to ensure this shows up on the treeherder summary, rs=emorley-over-irc MozReview-Commit-ID: COtfpoU14vg
build/automation.py.in
layout/tools/reftest/runreftest.py
layout/tools/reftest/runreftestmulet.py
testing/mochitest/runtests.py
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -448,23 +448,23 @@ class Automation(object):
           self.dumpScreen(utilityPath)
 
         (line, didTimeout) = self.readWithTimeout(logsource, timeout)
 
         if not hitMaxTime and maxTime and datetime.now() - startTime > timedelta(seconds = maxTime):
           # Kill the application.
           hitMaxTime = True
           self.log.info("TEST-UNEXPECTED-FAIL | %s | application ran for longer than allowed maximum time of %d seconds", self.lastTestSeen, int(maxTime))
-          self.log.warning("Force-terminating active process(es).");
+          self.log.error("Force-terminating active process(es).");
           self.killAndGetStack(proc.pid, utilityPath, debuggerInfo)
       if didTimeout:
         if line:
           self.log.info(line.rstrip().decode("UTF-8", "ignore"))
         self.log.info("TEST-UNEXPECTED-FAIL | %s | application timed out after %d seconds with no output", self.lastTestSeen, int(timeout))
-        self.log.warning("Force-terminating active process(es).");
+        self.log.error("Force-terminating active process(es).");
         if browserProcessId == -1:
           browserProcessId = proc.pid
         self.killAndGetStack(browserProcessId, utilityPath, debuggerInfo)
 
     status = proc.wait()
     printstatus("Main app process", status)
     if status == 0:
       self.lastTestSeen = "Main app process exited normally"
--- a/layout/tools/reftest/runreftest.py
+++ b/layout/tools/reftest/runreftest.py
@@ -499,17 +499,17 @@ class RefTest(object):
 
         return int(any(t.retcode != 0 for t in threads))
 
     def handleTimeout(self, timeout, proc, utilityPath, debuggerInfo):
         """handle process output timeout"""
         # TODO: bug 913975 : _processOutput should call self.processOutputLine
         # one more time one timeout (I think)
         self.log.error("%s | application timed out after %d seconds with no output" % (self.lastTestSeen, int(timeout)))
-        self.log.warning("Force-terminating active process(es).");
+        self.log.error("Force-terminating active process(es).");
         self.killAndGetStack(
             proc, utilityPath, debuggerInfo, dump_screen=not debuggerInfo)
 
     def dumpScreen(self, utilityPath):
         if self.haveDumpedScreen:
             self.log.info("Not taking screenshot here: see the one that was previously logged")
             return
         self.haveDumpedScreen = True
--- a/layout/tools/reftest/runreftestmulet.py
+++ b/layout/tools/reftest/runreftestmulet.py
@@ -157,17 +157,17 @@ class MuletReftest(RefTest):
 
         if self.build_type == "mulet":
             args += ['-chrome', 'chrome://b2g/content/shell.html']
         return cmd, args
 
     def _on_timeout(self):
         msg = "%s | application timed out after %s seconds with no output"
         self.log.testFail(msg % (self.last_test, self.timeout))
-        self.log.warning("Force-terminating active process(es).");
+        self.log.error("Force-terminating active process(es).");
 
         # kill process to get a stack
         self.runner.stop(sig=signal.SIGABRT)
 
     def _unlockScreen(self):
         self.marionette.set_context(self.marionette.CONTEXT_CONTENT)
         self.marionette.import_script(os.path.abspath(
             os.path.join(__file__, os.path.pardir, "gaia_lock_screen.js")))
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -2448,17 +2448,17 @@ class MochitestDesktop(MochitestBase):
         """handle process output timeout"""
         # TODO: bug 913975 : _processOutput should call self.processOutputLine
         # one more time one timeout (I think)
         error_message = "TEST-UNEXPECTED-TIMEOUT | %s | application timed out after %d seconds with no output" % (
             self.lastTestSeen, int(timeout))
         self.message_logger.dump_buffered()
         self.message_logger.buffering = False
         self.log.info(error_message)
-        self.log.warning("Force-terminating active process(es).");
+        self.log.error("Force-terminating active process(es).");
 
         browser_pid = browser_pid or proc.pid
         child_pids = self.extract_child_pids(processLog, browser_pid)
         self.log.info('Found child pids: %s' % child_pids)
 
         if HAVE_PSUTIL:
             child_procs = [psutil.Process(pid) for pid in child_pids]
             for pid in child_pids: