Changeset 215361 in webkit

Timestamp:

Apr 14, 2017 8:13:09 AM (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.

Server processes are destroyed in the driver, which is not necessary and prevents
the work-around implemented in ​https://bugs.webkit.org/show_bug.cgi?id=170741.

• Scripts/webkitpy/port/driver.py:

(Driver.run_test): Do not destroy server process.
(Driver._start): Only create the server process if it is None.
(Driver.stop): Do not destroy server process.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/driver.py (modified) (3 diffs)

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.
+
+        Server processes are destroyed in the driver, which is not necessary and prevents
+        the work-around implemented in https://bugs.webkit.org/show_bug.cgi?id=170741.
+
+        * Scripts/webkitpy/port/driver.py:
+        (Driver.run_test): Do not destroy server process.
+        (Driver._start): Only create the server process if it is None.
+        (Driver.stop): Do not destroy server process.
+
 2017-04-13  Dan Bernstein  <mitz@apple.com>
 

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

@@ -219 +219 @@
             if err:
                 self.error_from_test += err
-            self._server_process = None
 
         crash_log = None
@@ -370 +369 @@
         self._crashed_process_name = None
         self._crashed_pid = None
-        self._server_process = self._port._test_runner_process_constructor(self._port, self._server_name, self.cmd_line(pixel_tests, per_test_args), environment, target_host=self._target_host)
+        if self._server_process is None:
+            self._server_process = self._port._test_runner_process_constructor(self._port, self._server_name, self.cmd_line(pixel_tests, per_test_args), environment, target_host=self._target_host)
         self._server_process.start()
 
@@ -385 +385 @@
         if self._server_process:
             self._server_process.stop(self._port.driver_stop_timeout())
-            self._server_process = None
             if self._profiler:
                 self._profiler.profile_after_exit()