Fix bustage from rev 0aeedccc0125 (bug 530475) when running tests with maxTime.

This commit is contained in:
Jesse Ruderman 2010-01-19 15:47:57 -08:00
Родитель 8fd406e9f7
Коммит 95ac807a8a
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -577,7 +577,7 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t
self.log.info("Can't trigger Breakpad, just killing process")
proc.kill()
def waitForFinish(self, proc, utilityPath, timeout, maxTime):
def waitForFinish(self, proc, utilityPath, timeout, maxTime, startTime):
""" Look for timeout or crashes and return the status after the process terminates """
stackFixerProcess = None
didTimeout = False
@ -730,7 +730,7 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t
stderr = subprocess.STDOUT)
self.log.info("INFO | automation.py | Application pid: %d", proc.pid)
status = self.waitForFinish(proc, utilityPath, timeout, maxTime)
status = self.waitForFinish(proc, utilityPath, timeout, maxTime, startTime)
self.log.info("INFO | automation.py | Application ran for: %s", str(datetime.now() - startTime))
# Do a final check for zombie child processes.