Changeset 215380 in webkit

Timestamp:

Apr 14, 2017 4:26:52 PM (7 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r215374.

This change causes LayoutTests to exit early with crashes on
Sierra.

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/215374

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py (modified) (1 diff)
• Scripts/webkitpy/port/driver.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-04-14  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r215374.
+
+        This change causes LayoutTests to exit early with crashes on
+        Sierra.
+
+        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/215374
+
 2017-04-14  Dan Bernstein  <mitz@apple.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py

@@ -315 +315 @@
         # 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):

trunk/Tools/Scripts/webkitpy/port/driver.py

@@ -395 +395 @@
             self._driver_user_cache_directory = None
 
-        self._crashed_process_name = None
-        self._crashed_pid = None
-        self._driver_timed_out = False
-        self.error_from_test = str()
-        self.err_seen_eof = False
-
     def cmd_line(self, pixel_tests, per_test_args):
         cmd = self._command_wrapper()