Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-05 12:38:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update web-platform-tests to revision 5084587f6b05bf99ad09e7844be66dcc61070cdf

Browse source
This commit is contained in:
WPT Sync Bot 2018-04-25 21:10:30 -04:00 • committed by Anthony Ramine
parent 6d42d2f1e8
commit 7d1071a6a4
408 changed files with 8968 additions and 2608 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
View file

@ -153,10 +153,10 @@ class TestExecutor(object):
:param test: The test to run"""
if test.environment != self.last_environment:
self.on_environment_change(test.environment)
try:
result = self.do_test(test)
except Exception as e:
self.logger.warning(traceback.format_exc(e))
result = self.result_from_exception(test, e)
if result is Stop:
@ -547,6 +547,7 @@ class CallbackHandler(object):
def _send_message(self, message_type, status, message=None):
self.protocol.testdriver.send_message(message_type, status, message=message)
class ClickAction(object):
def __init__(self, logger, protocol):
self.logger = logger
@ -562,6 +563,7 @@ class ClickAction(object):
self.logger.debug("Clicking element: %s" % selector)
self.protocol.click.element(elements[0])
class SendKeysAction(object):
def __init__(self, logger, protocol):
self.logger = logger

6
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
View file

@ -475,7 +475,8 @@ class ExecuteAsyncScriptRun(object):
if message:
message += "\n"
message += traceback.format_exc(e)
self.result = False, ("INTERNAL-ERROR", e)
self.logger.warning(message)
self.result = False, ("INTERNAL-ERROR", None)
finally:
self.result_flag.set()
@ -551,6 +552,9 @@ class MarionetteTestharnessExecutor(TestharnessExecutor):
while True:
result = protocol.base.execute_script(
self.script_resume % format_map, async=True)
if result is None:
# This can happen if we get an content process crash
return None
done, rv = handler(result)
if done:
break

3
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
View file

@ -594,7 +594,8 @@ class TestRunnerManager(threading.Thread):
((subtest_unexpected or is_unexpected) and
self.restart_on_unexpected))
if (self.pause_after_test or
if (not file_result.status == "CRASH" and
self.pause_after_test or
(self.pause_on_unexpected and (subtest_unexpected or is_unexpected))):
self.logger.info("Pausing until the browser exits")
self.send_message("wait")