Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 12:35:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 917817 - Make several more python test harness failure modes TBPL parsable; r=jmaher

Browse Source
This commit is contained in:
Ed Morley 2013-09-19 13:20:17 +01:00
parent ae09c349ad
commit a4808ff3f8
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layout/tools/reftest/remotereftest.py
View File

@ -213,7 +213,7 @@ class ReftestServer:
self._process = self._automation.Process([xpcshell] + args, env = env)
pid = self._process.pid
if pid < 0:
print "Error starting server."
print "TEST-UNEXPECTED-FAIL | remotereftests.py | Error starting server."
return 2
self._automation.log.info("INFO | remotereftests.py | Server pid: %d", pid)
@ -233,7 +233,7 @@ class ReftestServer:
time.sleep(1)
i += 1
else:
print "Timed out while waiting for server startup."
print "TEST-UNEXPECTED-FAIL | remotereftests.py | Timed out while waiting for server startup."
self.stop()
return 1
@ -438,7 +438,7 @@ def main(args):
else:
dm = droid.DroidSUT(options.deviceIP, options.devicePort, deviceRoot=options.remoteTestRoot)
except devicemanager.DMError:
print "Error: exception while initializing devicemanager. Most likely the device is not in a testable state."
print "Automation Error: exception while initializing devicemanager. Most likely the device is not in a testable state."
return 1
automation.setDeviceManager(dm)

8
testing/mochitest/runtests.py
View File

@ -86,7 +86,7 @@ class MochitestServer:
self._process = self._automation.Process([xpcshell] + args, env = env)
pid = self._process.pid
if pid < 0:
log.error("Error starting server.")
log.error("TEST-UNEXPECTED-FAIL | runtests.py | Error starting server.")
sys.exit(2)
log.info("runtests.py | Server pid: %d", pid)
@ -101,7 +101,7 @@ class MochitestServer:
time.sleep(1)
i += 1
else:
log.error("Timed out while waiting for server startup.")
log.error("TEST-UNEXPECTED-FAIL | runtests.py | Timed out while waiting for server startup.")
self.stop()
sys.exit(1)
@ -147,7 +147,7 @@ class WebSocketServer(object):
self._process = self._automation.Process(cmd)
pid = self._process.pid
if pid < 0:
log.error("Error starting websocket server.")
log.error("TEST-UNEXPECTED-FAIL | runtests.py | Error starting websocket server.")
sys.exit(2)
log.info("runtests.py | Websocket server pid: %d", pid)
@ -608,7 +608,7 @@ class Mochitest(MochitestUtilsMixin):
status = -1
except:
traceback.print_exc()
log.error("runtests.py | Received unexpected exception while running application\n")
log.error("Automation Error: Received unexpected exception while running application\n")
status = 1
if options.vmwareRecording:

2
testing/mochitest/runtestsb2g.py
View File

@ -142,7 +142,7 @@ class B2GMochitest(MochitestUtilsMixin):
status = -1
except:
traceback.print_exc()
log.error("runtests.py | Received unexpected exception while running application\n")
log.error("Automation Error: Received unexpected exception while running application\n")
status = 1
self.stopWebServer(options)

2
testing/mochitest/runtestsremote.py
View File

@ -423,7 +423,7 @@ class MochiRemote(Mochitest):
if fail_found:
result = 1
if not end_found:
log.error("missing end of test marker (process crashed?)")
log.error("Automation Error: Missing end of test marker (process crashed?)")
result = 1
return result