diff options
| -rw-r--r-- | tests/wpt/metadata/MANIFEST.json | 2 | ||||
| -rw-r--r-- | tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservo.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 71e53ea3788..a6ded09628b 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -768576,7 +768576,7 @@ "support" ], "tools/wptrunner/wptrunner/executors/executorservo.py": [ - "8f8e120e66da6403f256f99f279f1f5dc8008272", + "4816c3df06e87f8e85301918c341bbff97817777", "support" ], "tools/wptrunner/wptrunner/executors/executorservodriver.py": [ diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservo.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservo.py index 8f8e120e66d..4816c3df06e 100644 --- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservo.py +++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservo.py @@ -332,6 +332,8 @@ class ServoCrashtestExecutor(ProcessTestExecutor): self.test = test success, data = ServoTimedRunner(self.logger, self.do_crashtest, self.protocol, test_url, timeout, self.extra_timeout).run() + # Ensure that no processes hang around if they timeout. + self.proc.kill() if success: return self.convert_result(test, data) |