Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 532184: add optional maxTime argument to runApp. r=ted

Browse Source
This commit is contained in:
Jesse Ruderman 2010-01-06 16:45:46 -08:00
parent 4fc756af56
commit d4106cb768
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
build/automation.py.in
View File

@ -38,7 +38,7 @@
# ***** END LICENSE BLOCK *****
import codecs
from datetime import datetime
from datetime import datetime, timedelta
import itertools
import logging
import os
@ -569,8 +569,11 @@ def runApp(testURL, env, app, profileDir, extraArgs,
runSSLTunnel = False, utilityPath = DIST_BIN,
xrePath = DIST_BIN, certPath = CERTS_SRC_DIR,
debuggerInfo = None, symbolsPath = None,
timeout = DEFAULT_TIMEOUT):
"Run the app, log the duration it took to execute, return the status code."
timeout = DEFAULT_TIMEOUT, maxTime = None):
"""
Run the app, log the duration it took to execute, return the status code.
Kills the app if it runs for longer than |maxTime| seconds, or outputs nothing for |timeout| seconds.
"""
# copy env so we don't munge the caller's environment
env = dict(env);
@ -652,19 +655,25 @@ def runApp(testURL, env, app, profileDir, extraArgs,
logsource = stackFixerProcess.stdout
(line, didTimeout) = readWithTimeout(logsource, timeout)
hitMaxTime = False
while line != "" and not didTimeout:
log.info(line.rstrip())
(line, didTimeout) = readWithTimeout(logsource, timeout)
if not hitMaxTime and maxTime and datetime.now() - startTime > timedelta(seconds = maxTime):
# Kill the application, but continue reading from stack fixer so as not to deadlock on stackFixerProcess.wait().
hitMaxTime = True
log.info("TEST-UNEXPECTED-FAIL | automation.py | application ran for longer than allowed maximum time of %d seconds", int(maxTime))
triggerBreakpad(proc, utilityPath)
if didTimeout:
log.info("TEST-UNEXPECTED-FAIL | automation.py | application timed out after %d seconds with no output", int(timeout))
triggerBreakpad(proc, utilityPath)
status = proc.wait()
if status != 0 and not didTimeout:
if status != 0 and not didTimeout and not hitMaxTime:
log.info("TEST-UNEXPECTED-FAIL | automation.py | Exited with code %d during test run", status)
if stackFixerProcess is not None:
fixerStatus = stackFixerProcess.wait()
if fixerStatus != 0 and not didTimeout:
if fixerStatus != 0 and not didTimeout and not hitMaxTime:
log.info("TEST-UNEXPECTED-FAIL | automation.py | Stack fixer process exited with code %d during test run", fixerStatus)
log.info("INFO | automation.py | Application ran for: %s", str(datetime.now() - startTime))