Title: [215374] trunk/Tools
- Revision
- 215374
- Author
- jbed...@apple.com
- Date
- 2017-04-14 13:52:36 -0700 (Fri, 14 Apr 2017)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (215373 => 215374)
--- trunk/Tools/ChangeLog 2017-04-14 20:52:29 UTC (rev 215373)
+++ trunk/Tools/ChangeLog 2017-04-14 20:52:36 UTC (rev 215374)
@@ -1,3 +1,18 @@
+2017-04-14 Jonathan Bedard <jbed...@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 <aes...@apple.com>
[ios-simulator] API test WebKit2.WKWebProcessPlugInRangeHandle timing out
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py (215373 => 215374)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py 2017-04-14 20:52:29 UTC (rev 215373)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py 2017-04-14 20:52:36 UTC (rev 215374)
@@ -314,11 +314,9 @@
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__.
- 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):
if self._options.run_singly:
Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (215373 => 215374)
--- trunk/Tools/Scripts/webkitpy/port/driver.py 2017-04-14 20:52:29 UTC (rev 215373)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2017-04-14 20:52:36 UTC (rev 215374)
@@ -394,6 +394,12 @@
self._target_host.filesystem.rmtree(self._driver_user_cache_directory)
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()
cmd.append(self._port._path_to_driver())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
