author | Andrew Halberstadt <ahalberstadt@mozilla.com> |
Mon, 30 Sep 2013 11:05:46 -0400 | |
changeset 149277 | 4e93e321909de787011d658fa27f8ecbb0842d2e |
parent 149276 | 7b6959c6c4f69a00919d98bc45d9406134d9f58e |
child 149278 | e412eef638b1c8775cd9f692321844ffe27f9782 |
push id | 25380 |
push user | ryanvm@gmail.com |
push date | Mon, 30 Sep 2013 20:16:36 +0000 |
treeherder | mozilla-central@1332fc1c15e1 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | edmorley |
bugs | 917252 |
milestone | 27.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
|
--- a/testing/mochitest/runtestsb2g.py +++ b/testing/mochitest/runtestsb2g.py @@ -130,17 +130,20 @@ class B2GMochitest(MochitestUtilsMixin): runner_args = { 'profile': self.profile, 'devicemanager': self._dm, 'marionette': self.marionette, 'remote_test_root': self.remote_test_root, 'test_script': self.test_script, 'test_script_args': self.test_script_args } self.runner = B2GRunner(**runner_args) self.runner.start(outputTimeout=timeout) - self.runner.wait() + status = self.runner.wait() + if status is None: + # the runner has timed out + status = 124 except KeyboardInterrupt: log.info("runtests.py | Received keyboard interrupt.\n"); status = -1 except: traceback.print_exc() log.error("Automation Error: Received unexpected exception while running application\n") status = 1