Introduce WPTServe for running W3C Blink Layout tests

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

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 47 matching lines @@
 from webkitpy.common.webkit_finder import WebKitFinder
 from webkitpy.layout_tests.layout_package.bot_test_expectations import BotTestExpectationsFactory
 from webkitpy.layout_tests.models import test_run_results
 from webkitpy.layout_tests.models.test_configuration import TestConfiguration
 from webkitpy.layout_tests.port import config as port_config
 from webkitpy.layout_tests.port import driver
 from webkitpy.layout_tests.port import server_process
 from webkitpy.layout_tests.port.factory import PortFactory
 from webkitpy.layout_tests.servers import apache_http
 from webkitpy.layout_tests.servers import pywebsocket
+from webkitpy.layout_tests.servers import wptserve_http
 
 _log = logging.getLogger(__name__)
 
 
 # FIXME: This class should merge with WebKitPort now that Chromium behaves mostly like other webkit ports.
 class Port(object):
     """Abstract class for Port-specific hooks for the layout_test package."""
 
     # Subclasses override this. This should indicate the basic implementation
     # part of the port name, e.g., 'mac', 'win', 'gtk'; there is probably (?)
@@ skipping 102 matching lines @@
 
         self.host = host
         self._executive = host.executive
         self._filesystem = host.filesystem
         self._webkit_finder = WebKitFinder(host.filesystem)
         self._config = port_config.Config(self._executive, self._filesystem, self.port_name)
 
         self._helper = None
         self._http_server = None
         self._websocket_server = None
+        self._is_wpt_enabled = hasattr(options, 'enable_wptserve') and options.enable_wptserve
+        self._wpt_server = None
         self._image_differ = None
         self._server_process_constructor = server_process.ServerProcess  # overridable for testing
         self._http_lock = None  # FIXME: Why does this live on the port object?
         self._dump_reader = None
 
         # Python's Popen has a bug that causes any pipes opened to a
         # process that can't be executed to be leaked.  Since this
         # code is specifically designed to tolerate exec failures
         # to gracefully handle cases where wdiff is not installed,
         # the bug results in a massive file descriptor leak. As a
@@ skipping 956 matching lines @@
     def start_websocket_server(self):
         """Start a web server. Raise an error if it can't start or is already running.
 
         Ports can stub this out if they don't need a websocket server to be running."""
         assert not self._websocket_server, 'Already running a websocket server.'
 
         server = pywebsocket.PyWebSocket(self, self.results_directory())
         server.start()
         self._websocket_server = server
 
+    def set_is_wpt_enabled(self, is_wpt_enabled):
+        self._is_wpt_enabled = is_wpt_enabled

[Dirk Pranke, 2015/06/05 18:27:48]

It doesn't seem like you need this, since it is set in the constructor from the
options object?

[burnik, 2015/06/08 12:37:01]

That's right. I wasn't sure if I would be able to pass through options at the
point when I was adding the modifier. So it remained here since I didn't
properly clean up. :-/

Removed.

+
+    def is_wpt_enabled(self):
+        """Used as feature flag for WPT Serve feature."""
+        return self._is_wpt_enabled
+
+    def is_wpt_test(self, test):
+        """Whether this test is part of a web-platform-tests which require wptserve servers."""
+        return "web-platform-tests" in test
+
+    def start_wptserve(self):
+        """Start a WPT web server. Raise an error if it can't start or is already running.
+
+        Ports can stub this out if they don't need a WPT web server to be running."""
+        assert not self._wpt_server, 'Already running an http server.'
+        assert self.is_wpt_enabled(), 'Cannot start server if WPT is not enabled.'
+
+        # We currently don't support any output mechanism for the WPT server.
+        server = wptserve_http.WPTServeHTTP(self, self.results_directory())
+        server.start()
+        self._wpt_server = server
+
+    def stop_wptserve(self):
+        """Shut down the WPT server if it is running. Do nothing if it isn't."""
+        if self._wpt_server:
+            self._wpt_server.stop()
+            self._wpt_server = None
+
     def http_server_supports_ipv6(self):
         # Apache < 2.4 on win32 does not support IPv6, nor does cygwin apache.
         if self.host.platform.is_cygwin() or self.host.platform.is_win():
             return False
         return True
 
     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."""
@@ skipping 453 matching lines @@
         for suite in self.physical_test_suites():
             if test_name.startswith(suite.name):
                 return suite.reference_args
         return []
 
     def should_run_as_pixel_test(self, test_input):
         if not self._options.pixel_tests:
             return False
         if self._options.pixel_test_directories:
             return any(test_input.test_name.startswith(directory) for directory in self._options.pixel_test_directories)
+        # TODO(burnik): Make sure this is the right way to do it.
+        if self.is_wpt_enabled() and self.is_wpt_test(test_input.test_name):
+            return False
         return True
 
     def _modules_to_search_for_symbols(self):
         path = self._path_to_webcore_library()
         if path:
             return [path]
         return []
 
     def _symbols_string(self):
         symbols = ''
@@ skipping 103 matching lines @@
 class PhysicalTestSuite(object):
     def __init__(self, base, args, reference_args=None):
         self.name = base
         self.base = base
         self.args = args
         self.reference_args = args if reference_args is None else reference_args
         self.tests = set()
 
     def __repr__(self):
         return "PhysicalTestSuite('%s', '%s', %s, %s)" % (self.name, self.base, self.args, self.reference_args)