Merge pull request #121 from w3c/jgraham/servo_crash_detection

Fix crash detection for testharness tests with servo executor; r=Ms2ger
web-platform-tests · Jun 11, 2015 · 60d06f1 · 60d06f1
2 parents 27ae6ed + 903989e
commit 60d06f1
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/wptrunner/executors/executorservo.py b/wptrunner/executors/executorservo.py
@@ -99,15 +99,18 @@ def do_test(self, test):
                 self.proc.wait()
 
             proc_is_running = True
-            if self.result_flag.is_set() and self.result_data is not None:
-                self.result_data["test"] = test.url
-                result = self.convert_result(test, self.result_data)
-            else:
-                if self.proc.poll() is not None:
+
+            if self.result_flag.is_set():
+                if self.result_data is not None:
+                    self.result_data["test"] = test.url
+                    result = self.convert_result(test, self.result_data)
+                else:
+                    self.proc.wait()
                     result = (test.result_cls("CRASH", None), [])
                     proc_is_running = False
-                else:
-                    result = (test.result_cls("TIMEOUT", None), [])
+            else:
+                result = (test.result_cls("TIMEOUT", None), [])
+
 
             if proc_is_running:
                 if self.pause_after_test: