aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-01-14 10:25:52 -0500
committerGitHub <noreply@github.com>2019-01-14 10:25:52 -0500
commite1cff7b8a7f661675f2caf4c852d029510bdf21d (patch)
treece7a9317624dc90689da41a8f3251578ed70d1a7
parentb1a4913b3f84162363143de9620240ff6064def1 (diff)
parent78c278189169c47ab5c3b2f559fabcac5db6925a (diff)
downloadservo-e1cff7b8a7f661675f2caf4c852d029510bdf21d.tar.gz
servo-e1cff7b8a7f661675f2caf4c852d029510bdf21d.zip
Auto merge of #22673 - shanavas786:fix-servo-is-alive, r=jdm
Fix ServoDriver is_alive method <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #22664 <!-- Either: --> - [ ] There are tests for these changes OR - [x] These changes do not require tests because it fixes test runner <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22673) <!-- Reviewable:end -->
-rw-r--r--tests/wpt/metadata/MANIFEST.json2
-rw-r--r--tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py4
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 9dcc338ee94..850c618f20d 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -675404,7 +675404,7 @@
"support"
],
"tools/wptrunner/wptrunner/browsers/servodriver.py": [
- "0a63a32c96699a441ce696bae6b8d32f4d69bc3d",
+ "75cee5abb68a67ebf624be28294a635ce5790cba",
"support"
],
"tools/wptrunner/wptrunner/browsers/webkit.py": [
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py
index 0a63a32c966..75cee5abb68 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py
@@ -166,9 +166,7 @@ class ServoWebDriverBrowser(Browser):
command=" ".join(self.command))
def is_alive(self):
- if self.runner:
- return self.runner.is_running()
- return False
+ return self.proc.poll() is None
def cleanup(self):
self.stop()