Changeset 278332 in webkit

Timestamp:

Jun 1, 2021, 4:23:21 PM (5 years ago)

Author:

Jonathan Bedard

Message:

[run-webkit-tests] Move helper out of Port instance
​https://bugs.webkit.org/show_bug.cgi?id=226344
<rdar://problem/78575542>

Reviewed by Dewei Zhu.

The "helper" is a popen object, which are not pickleable, and cannot
belong to an instantiated port object.

• Scripts/webkitpy/port/base.py:

(Port): Make helper class variable.
(Port.init):
(Port.stop_helper): All classes should share the same code to stop the helper process.

• Scripts/webkitpy/port/mac.py:

(MacPort.start_helper): Use class variable.
(MacPort.stop_helper): Moved to base class..

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/controllers/manager.py (modified) (1 diff)
• Scripts/webkitpy/port/base.py (modified) (3 diffs)
• Scripts/webkitpy/port/mac.py (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-06-01  Jonathan Bedard  <jbedard@apple.com>
+
+        [run-webkit-tests] Move helper out of Port instance
+        https://bugs.webkit.org/show_bug.cgi?id=226344
+        <rdar://problem/78575542>
+
+        Reviewed by Dewei Zhu.
+
+        The "helper" is a popen object, which are not pickleable, and cannot
+        belong to an instantiated port object.
+
+        * Scripts/webkitpy/port/base.py:
+        (Port): Make helper class variable.
+        (Port.__init__):
+        (Port.stop_helper): All classes should share the same code to stop the helper process.
+        * Scripts/webkitpy/port/mac.py:
+        (MacPort.start_helper): Use class variable.
+        (MacPort.stop_helper): Moved to base class..
+
 2021-06-01  Fujii Hironori  <Hironori.Fujii@sony.com>
 

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

@@ -576 +576 @@
 
         _log.debug("Restarting helper")
-        self._port.stop_helper()
         self._options.pixel_tests = True
         return self._port.start_helper(prefer_integrated_gpu=self._options.prefer_integrated_gpu)

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

@@ -82 +82 @@
     DEFAULT_DEVICE_TYPES = []
 
+    helper = None
+
     @classmethod
     def determine_full_port_name(cls, host, options, port_name):
@@ -116 +118 @@
         self.pretty_patch = PrettyPatch(self._executive, self.path_from_webkit_base(), self._filesystem)
 
-        self._helper = None
         self._http_server = None
         self._websocket_server = None
@@ -959 +960 @@
     def stop_helper(self):
         """Shut down the test helper if it is running. Do nothing if
-        it isn't, or it isn't available. If a port overrides start_helper()
-        it must override this routine as well."""
-        pass
+        it isn't, or it isn't available."""
+        if Port.helper:
+            _log.debug("Stopping LayoutTestHelper")
+            try:
+                Port.helper.stdin.write(b"x\n")
+                Port.helper.stdin.close()
+                Port.helper.wait()
+            except IOError as e:
+                _log.debug("IOError raised while stopping helper: %s" % str(e))
+            Port.helper = None
 
     def stop_http_server(self):

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

@@ -38 +38 @@
 from webkitpy.common.version_name_map import PUBLIC_TABLE, INTERNAL_TABLE
 from webkitpy.common.version_name_map import VersionNameMap
+from webkitpy.port.base import Port
 from webkitpy.port.config import apple_additions, Config
 from webkitpy.port.darwin import DarwinPort
@@ -246 +247 @@
 
     def start_helper(self, pixel_tests=False, prefer_integrated_gpu=False):
+        self.stop_helper()
+
         helper_path = self._path_to_helper()
         if not helper_path:
@@ -254 +257 @@
         if prefer_integrated_gpu:
             arguments.append('--prefer-integrated-gpu')
-        self._helper = self._executive.popen(arguments,
+        Port.helper = self._executive.popen(arguments,
             stdin=self._executive.PIPE, stdout=self._executive.PIPE, stderr=None)
-        is_ready = self._helper.stdout.readline()
+        is_ready = Port.helper.stdout.readline()
         if not is_ready.startswith(b'ready'):
             _log.error("LayoutTestHelper could not start")
@@ -272 +275 @@
                 if e.exit_code != 1:
                     raise e
-
-    def stop_helper(self):
-        if self._helper:
-            _log.debug("Stopping LayoutTestHelper")
-            try:
-                self._helper.stdin.write(b"x\n")
-                self._helper.stdin.close()
-                self._helper.wait()
-            except IOError as e:
-                _log.debug("IOError raised while stopping helper: %s" % str(e))
-            self._helper = None
 
     def logging_patterns_to_strip(self):