Changeset 217572 in webkit

Timestamp:

May 30, 2017 2:08:11 PM (7 years ago)

Author:

Jonathan Bedard

Message:

webkitpy: Start servers before setting-up for testing
​https://bugs.webkit.org/show_bug.cgi?id=172176
<rdar://problem/32225538>

Reviewed by Alexey Proskuryakov.

On-device testing requires that servers are started before ports set-up their
test environments.

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

(LayoutTestRunner.init): Start servers when initializing LayoutTestRunner.
Servers are unconditionally stopped on exit.
(LayoutTestRunner.run_tests): Move the starting of servers to the initializer. The
Manager now stops servers.
(LayoutTestRunner.start_servers): Set flag to indicate servers are running.
(LayoutTestRunner.stop_servers): Check flag, only shutdown servers if they are shutdown.

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

(Manager.init): Delay construction of the test runner until we can determine
if servers need to be started.
(Manager.run): Determine if servers need to be started and construct the test runner.
Shut servers down when the test run is finished.
(Manager._run_tests): Move the determination of servers to run into Manager.run.

• Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:

(is_wpt_server_running): Server is not running if no config is found.

• Scripts/webkitpy/layout_tests/servers/websocket_server.py:

(PyWebSocket.is_running): Check if this WebSocket server is running.

• Scripts/webkitpy/port/base.py:

(Port.init): Define secure WebSocket server.
(Port.to.is_websocket_server_running): Check if WebSocket servers are defined.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py (modified) (8 diffs)
• Scripts/webkitpy/layout_tests/controllers/manager.py (modified) (4 diffs)
• Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/servers/websocket_server.py (modified) (3 diffs)
• Scripts/webkitpy/port/base.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-05-30  Jonathan Bedard  <jbedard@apple.com>
+
+        webkitpy: Start servers before setting-up for testing
+        https://bugs.webkit.org/show_bug.cgi?id=172176
+        <rdar://problem/32225538>
+
+        Reviewed by Alexey Proskuryakov.
+
+        On-device testing requires that servers are started before ports set-up their
+        test environments.
+
+        * Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py:
+        (LayoutTestRunner.__init__): Start servers when initializing LayoutTestRunner.
+        Servers are unconditionally stopped on exit.
+        (LayoutTestRunner.run_tests): Move the starting of servers to the initializer. The
+        Manager now stops servers.
+        (LayoutTestRunner.start_servers): Set flag to indicate servers are running.
+        (LayoutTestRunner.stop_servers): Check flag, only shutdown servers if they are shutdown.
+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
+        (Manager.__init__): Delay construction of the test runner until we can determine
+        if servers need to be started.
+        (Manager.run): Determine if servers need to be started and construct the test runner.
+        Shut servers down when the test run is finished.
+        (Manager._run_tests): Move the determination of servers to run into Manager.run.
+        * Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:
+        (is_wpt_server_running): Server is not running if no config is found.
+        * Scripts/webkitpy/layout_tests/servers/websocket_server.py:
+        (PyWebSocket.is_running): Check if this WebSocket server is running.
+        * Scripts/webkitpy/port/base.py:
+        (Port.__init__): Define secure WebSocket server.
+        (Port.to.is_websocket_server_running): Check if WebSocket servers are defined.
+
 2017-05-30  Daniel Bates  <dabates@apple.com>
 

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

@@ -27 +27 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import atexit
 import logging
 import math
@@ -62 +63 @@
 
 class LayoutTestRunner(object):
-    def __init__(self, options, port, printer, results_directory, test_is_slow_fn):
+    def __init__(self, options, port, printer, results_directory, test_is_slow_fn, needs_http=False, needs_websockets=False, needs_web_platform_test_server=False):
         self._options = options
         self._port = port
@@ -68 +69 @@
         self._results_directory = results_directory
         self._test_is_slow = test_is_slow_fn
+        self._needs_http = needs_http
+        self._needs_websockets = needs_websockets
+        self._needs_web_platform_test_server = needs_web_platform_test_server
+
         self._sharder = Sharder(self._port.split_test)
         self._filesystem = self._port.host.filesystem
@@ -73 +78 @@
         self._expectations = None
         self._test_inputs = []
-        self._needs_http = None
-        self._needs_websockets = None
-        self._needs_web_platform_test_server = None
         self._retrying = False
         self._current_run_results = None
+
+        if ((self._needs_http and self._options.http) or self._needs_web_platform_test_server) and self._port.get_option("start_http_servers_if_needed"):
+            self.start_servers()
+            atexit.register(lambda: self.stop_servers())
 
     def get_worker_count(self, test_inputs, child_process_count):
@@ -83 +89 @@
         return min(child_process_count, len(all_shards))
 
-    def run_tests(self, expectations, test_inputs, tests_to_skip, num_workers, needs_http, needs_websockets, needs_web_platform_test_server, retrying):
+    def run_tests(self, expectations, test_inputs, tests_to_skip, num_workers, retrying):
         self._expectations = expectations
         self._test_inputs = test_inputs
-        self._needs_http = needs_http
-        self._needs_websockets = needs_websockets
-        self._needs_web_platform_test_server = needs_web_platform_test_server
+
         self._retrying = retrying
 
@@ -107 +111 @@
         self._printer.write_update('Sharding tests ...')
         all_shards = self._sharder.shard_tests(test_inputs, int(self._options.child_processes), self._options.fully_parallel)
-
-        if (self._needs_http and self._options.http) or self._needs_web_platform_test_server:
-            if self._port.get_option("start_http_servers_if_needed"):
-                self.start_servers()
 
         self._printer.print_workers_and_shards(num_workers, len(all_shards))
@@ -132 +132 @@
             _log.debug('%s("%s") raised, exiting' % (e.__class__.__name__, str(e)))
             raise
-        finally:
-            self.stop_servers()
 
         return run_results
@@ -190 +188 @@
 
     def start_servers(self):
-        if self._needs_http:
+        if self._needs_http and not self._port.is_http_server_running():
             self._printer.write_update('Starting HTTP server ...')
             self._port.start_http_server()
-        if self._needs_websockets:
+        if self._needs_websockets and not self._port.is_websocket_servers_running():
             self._printer.write_update('Starting WebSocket server ...')
             self._port.start_websocket_server()
-        if self._needs_web_platform_test_server:
+        if self._needs_web_platform_test_server and not self._port.is_wpt_server_running():
             self._printer.write_update('Starting Web Platform Test server ...')
             self._port.start_web_platform_test_server()

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

@@ -86 +86 @@
         self._results_directory = self._port.results_directory()
         self._finder = LayoutTestFinder(self._port, self._options)
-        self._runner = LayoutTestRunner(self._options, self._port, self._printer, self._results_directory, self._test_is_slow)
+        self._runner = None
 
         test_options_json_path = self._port.path_from_webkit_base(self.LAYOUT_TESTS_DIRECTORY, "tests-options.json")
@@ -234 +234 @@
         enabled_pixel_tests_in_retry = False
 
+        needs_http = any((self._is_http_test(test) and not self._needs_web_platform_test(test)) for test in tests_to_run)
+        needs_web_platform_test_server = any(self._needs_web_platform_test(test) for test in tests_to_run)
+        needs_websockets = any(self._is_websocket_test(test) for test in tests_to_run)
+        self._runner = LayoutTestRunner(self._options, self._port, self._printer, self._results_directory, self._test_is_slow,
+                                        needs_http=needs_http, needs_web_platform_test_server=needs_web_platform_test_server, needs_websockets=needs_websockets)
+
         if default_device_tests:
             _log.info('')
@@ -258 +264 @@
                 enabled_pixel_tests_in_retry |= device_enabled_pixel_tests_in_retry
 
+        self._runner.stop_servers()
         end_time = time.time()
         return self._end_test_run(start_time, end_time, initial_results, retry_results, enabled_pixel_tests_in_retry)
@@ -319 +326 @@
 
     def _run_tests(self, tests_to_run, tests_to_skip, repeat_each, iterations, num_workers, retrying):
-        needs_http = any((self._is_http_test(test) and not self._needs_web_platform_test(test)) for test in tests_to_run)
-        needs_web_platform_test_server = any(self._needs_web_platform_test(test) for test in tests_to_run)
-        needs_websockets = any(self._is_websocket_test(test) for test in tests_to_run)
-
         test_inputs = self._get_test_inputs(tests_to_run, repeat_each, iterations)
 
-        return self._runner.run_tests(self._expectations, test_inputs, tests_to_skip, num_workers, needs_http, needs_websockets, needs_web_platform_test_server, retrying)
+        return self._runner.run_tests(self._expectations, test_inputs, tests_to_skip, num_workers, retrying)
 
     def _clean_up_run(self):

trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py

@@ -58 +58 @@
 def is_wpt_server_running(port_obj):
     config = wpt_config_json(port_obj)
+    if not config:
+        return False
     return http_server_base.HttpServerBase._is_running_on_port(config["ports"]["http"][0])
 

trunk/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py

@@ -30 +30 @@
 """A class to help start/stop the PyWebSocket server used by layout tests."""
 
+import errno
 import logging
 import os
+import socket
 import sys
 import time
@@ -57 +59 @@
         """
         http_server.Lighttpd.__init__(self, port_obj, output_dir,
-                                      port=PyWebSocket.DEFAULT_WS_PORT,
+                                      port=port,
                                       root=root)
         self._output_dir = output_dir
@@ -106 +108 @@
         else:
             self._log_prefix = _WS_LOG_NAME
+
+    def is_running(self):
+        s = socket.socket()
+        try:
+            s.connect(('localhost', self._port))
+        except IOError, e:
+            if e.errno not in (errno.ECONNREFUSED, errno.ECONNRESET):
+                raise
+            return False
+        finally:
+            s.close()
+        return True
 
     def ports_to_forward(self):

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

@@ -128 +128 @@
         self._http_server = None
         self._websocket_server = None
+        self._websocket_secure_server = None
         self._web_platform_test_server = None
         self._image_differ = None
@@ -974 +975 @@
         return http_server_base.is_http_server_running()
 
+    def is_websocket_servers_running(self):
+        if self._websocket_secure_server and self._websocket_server:
+            return self._websocket_secure_server.is_running() and self._websocket_server.is_running()
+        elif self._websocket_server:
+            return self._websocket_server.is_running()
+        return False
+
     def is_wpt_server_running(self):
         return web_platform_test_server.is_wpt_server_running(self)