wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1201822 - Update to latest wptrunner, a=testonly

Browse Source
This commit is contained in:
James Graham 2015-09-03 15:57:29 +01:00
parent 9b37007ee3
commit 07c8de4f02
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
testing/web-platform/harness/wptrunner/executors/executorservo.py
View File

@ -65,6 +65,8 @@ class ServoTestharnessExecutor(ProcessTestExecutor):
args = ["--cpu", "--hard-fail", "-u", "Servo/wptrunner", "-z", self.test_url(test)]
for stylesheet in self.browser.user_stylesheets:
args += ["--user-stylesheet", stylesheet]
for pref in test.environment.get('prefs', {}):
args += ["--pref", pref]
debug_args, command = browser_command(self.binary, args, self.debug_info)
self.command = command
@ -198,6 +200,9 @@ class ServoRefTestExecutor(ProcessTestExecutor):
for stylesheet in self.browser.user_stylesheets:
command += ["--user-stylesheet", stylesheet]
for pref in test.environment.get('prefs', {}):
command += ["--pref", pref]
self.command = debug_args + command
env = os.environ.copy()

7
testing/web-platform/harness/wptrunner/testrunner.py
View File

@ -199,6 +199,7 @@ class TestRunnerManager(threading.Thread):
self.browser = None
self.browser_pid = None
self.browser_started = False
# Flags used to shut down this thread if we get a sigint
self.parent_stop_flag = stop_flag
@ -279,6 +280,10 @@ class TestRunnerManager(threading.Thread):
if commands[command](*data) is Stop:
break
else:
if (self.debug_info and self.debug_info.interactive and
self.browser_started and not browser.is_alive()):
self.logger.debug("Debugger exited")
break
if not self.test_runner_proc.is_alive():
if not self.command_queue.empty():
# We got a new message so process that
@ -355,6 +360,7 @@ class TestRunnerManager(threading.Thread):
succeeded = False
else:
succeeded = True
self.browser_started = True
# This has to happen after the lock is released
if not succeeded:
@ -457,6 +463,7 @@ class TestRunnerManager(threading.Thread):
return
try:
self.browser.stop()
self.browser_started = False
if self.test_runner_proc.is_alive():
self.send_message("stop")
self.ensure_runner_stopped()