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 -->
This commit is contained in:
bors-servo 2019-01-14 10:25:52 -05:00 committed by GitHub
commit e1cff7b8a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions

View file

@ -675404,7 +675404,7 @@
"support"
],
"tools/wptrunner/wptrunner/browsers/servodriver.py": [
"0a63a32c96699a441ce696bae6b8d32f4d69bc3d",
"75cee5abb68a67ebf624be28294a635ce5790cba",
"support"
],
"tools/wptrunner/wptrunner/browsers/webkit.py": [

View file

@ -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()