Changeset 215374 in webkit

Timestamp:

Apr 14, 2017 1:52:36 PM (7 years ago)

Author:

Jonathan Bedard

Message:

webkitpy: Ignore previously launched pid when system is under stress
​https://bugs.webkit.org/show_bug.cgi?id=170741

Unreviewed infrastructure fix.

Drivers are destroyed between failing layout tests, which is not necessary and
prevents the work-around implemented in ​https://bugs.webkit.org/show_bug.cgi?id=170741.

• Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py:

(Worker._kill_driver): Do not destroy drivers when they are stopped.

• Scripts/webkitpy/port/driver.py:

(Driver.stop): Reset driver values set in initializer.

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  Jonathan Bedard  <jbedard@apple.com>
+
+        webkitpy: Ignore previously launched pid when system is under stress
+        https://bugs.webkit.org/show_bug.cgi?id=170741
+
+        Unreviewed infrastructure fix.
+
+        Drivers are destroyed between failing layout tests, which is not necessary and
+        prevents the work-around implemented in https://bugs.webkit.org/show_bug.cgi?id=170741.
+
+        * Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py:
+        (Worker._kill_driver): Do not destroy drivers when they are stopped.
+        * Scripts/webkitpy/port/driver.py:
+        (Driver.stop): Reset driver values set in initializer.
+
 2017-04-14  Andy Estes  <aestes@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__.
-        driver = self._driver
-        self._driver = None
-        if driver:
+        if self._driver:
             _log.debug("%s killing driver" % self._name)
-            driver.stop()
+            self._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()