Title: [215367] trunk/Tools
Revision
215367
Author
ryanhad...@apple.com
Date
2017-04-14 10:57:40 -0700 (Fri, 14 Apr 2017)

Log Message

Unreviewed, rolling out r215363.

This change causes LayoutTests to exit early with crashes.

Reverted changeset:

"webkitpy: Ignore previously launched pid when system is under
stress"
https://bugs.webkit.org/show_bug.cgi?id=170741
http://trac.webkit.org/changeset/215363

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (215366 => 215367)


--- trunk/Tools/ChangeLog	2017-04-14 17:57:26 UTC (rev 215366)
+++ trunk/Tools/ChangeLog	2017-04-14 17:57:40 UTC (rev 215367)
@@ -1,3 +1,16 @@
+2017-04-14  Ryan Haddad  <ryanhad...@apple.com>
+
+        Unreviewed, rolling out r215363.
+
+        This change causes LayoutTests to exit early with crashes.
+
+        Reverted changeset:
+
+        "webkitpy: Ignore previously launched pid when system is under
+        stress"
+        https://bugs.webkit.org/show_bug.cgi?id=170741
+        http://trac.webkit.org/changeset/215363
+
 2017-04-14  Jonathan Bedard  <jbed...@apple.com>
 
         webkitpy: Ignore previously launched pid when system is under stress

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py (215366 => 215367)


--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py	2017-04-14 17:57:26 UTC (rev 215366)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py	2017-04-14 17:57:40 UTC (rev 215367)
@@ -314,9 +314,11 @@
     def _kill_driver(self):
         # Be careful about how and when we kill the driver; if driver.stop()
         # raises an exception, this routine may get re-entered via __del__.
-        if self._driver:
+        driver = self._driver
+        self._driver = None
+        if driver:
             _log.debug("%s killing driver" % self._name)
-            self._driver.stop()
+            driver.stop()
 
     def _run_test_with_or_without_timeout(self, test_input, timeout, stop_when_done):
         if self._options.run_singly:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to