зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1421799 - [reftest] Log 'GECKO(<pid>)' instead of 'ProcessReader' for process_output log actions r=gbrown
MozReview-Commit-ID: FsKg5Gtwx9Z --HG-- extra : rebase_source : 3bb118c510be08bb8716d553beeae09c7d60d82b
This commit is contained in:
Родитель
0ba48a4da2
Коммит
b59244590b
|
@ -128,6 +128,7 @@ class OutputHandler(object):
|
|||
def __init__(self, log, utilityPath, symbolsPath=None):
|
||||
self.stack_fixer_function = get_stack_fixer_function(utilityPath, symbolsPath)
|
||||
self.log = log
|
||||
self.proc_name = None
|
||||
|
||||
def __call__(self, line):
|
||||
# need to return processed messages to appease remoteautomation.py
|
||||
|
@ -151,4 +152,5 @@ class OutputHandler(object):
|
|||
def verbatim(self, line):
|
||||
if self.stack_fixer_function:
|
||||
line = self.stack_fixer_function(line)
|
||||
self.log.process_output(threading.current_thread().name, line)
|
||||
name = self.proc_name or threading.current_thread().name
|
||||
self.log.process_output(name, line)
|
||||
|
|
|
@ -713,6 +713,7 @@ class RefTest(object):
|
|||
interactive=interactive,
|
||||
outputTimeout=timeout)
|
||||
proc = runner.process_handler
|
||||
outputHandler.proc_name = 'GECKO({})'.format(proc.pid)
|
||||
|
||||
# Used to defer a possible IOError exception from Marionette
|
||||
marionette_exception = None
|
||||
|
@ -749,6 +750,7 @@ class RefTest(object):
|
|||
|
||||
status = runner.wait()
|
||||
runner.process_handler = None
|
||||
outputHandler.proc_name = None
|
||||
|
||||
if status:
|
||||
msg = "TEST-UNEXPECTED-FAIL | %s | application terminated with exit code %s" % \
|
||||
|
|
Загрузка…
Ссылка в новой задаче