Introduce WPTServe for running W3C Blink Layout tests

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

 # Copyright (C) 2011 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 204 matching lines @@
 
     # FIXME: Seems this could just be inlined into callers.
     @classmethod
     def _command_wrapper(cls, wrapper_option):
         # Hook for injecting valgrind or other runtime instrumentation,
         # used by e.g. tools/valgrind/valgrind_tests.py.
         return shlex.split(wrapper_option) if wrapper_option else []
 
     HTTP_DIR = "http/tests/"
     HTTP_LOCAL_DIR = "http/tests/local/"
+    WPT_DIR = "imported/web-platform-tests/"
 
     def is_http_test(self, test_name):
         return test_name.startswith(self.HTTP_DIR) and not test_name.startswith(self.HTTP_LOCAL_DIR)
 
+    def is_wpt_test(self, test_name):
+        # TODO(burnik): Remove feature flag check once WPT behaves stable.
+        return self._port.is_wpt_enabled() and "web-platform-tests" in test_name

[jsbell, 2015/06/04 17:43:25]

Use WPT_DIR here?

[Dirk Pranke, 2015/06/04 20:51:53]

I would add an is_wpt_test() method on the port, and call that from all of the
places you need this, rather than adding this three times.

[burnik, 2015/06/05 12:59:28]

Factored out.

[burnik, 2015/06/05 12:59:29]

Done.

+
+    def _get_http_host_and_ports_for_test(self, test_name):
+        if self.is_wpt_test(test_name):
+            # TODO(burnik): Read from config or args.

[Dirk Pranke, 2015/06/04 20:51:53]

Do you imagine needing multiple entries here? Why isn't hard-coded good enough?

[burnik, 2015/06/05 12:59:28]

Hardcoded is good enough for now. I believe it would be easier to have this in
one place so we can adjust the config rather than maintaining the values in at
least 2 places.

+            return ("web-platform.test", 8001, 8444)
+        else:
+            return ("127.0.0.1", 8000, 8443)
+
     def test_to_uri(self, test_name):
         """Convert a test name to a URI.
 
         Tests which have an 'https' directory in their paths (e.g.
         '/http/tests/security/mixedContent/https/test1.html') or '.https.' in
         their name (e.g. 'http/tests/security/mixedContent/test1.https.html') will
         be loaded over HTTPS; all other tests over HTTP.
         """
-        if not self.is_http_test(test_name):
+        is_wpt_test = self.is_wpt_test(test_name)
+
+        if not self.is_http_test(test_name) and not is_wpt_test:
             return path.abspath_to_uri(self._port.host.platform, self._port.abspath_for_test(test_name))
 
-        relative_path = test_name[len(self.HTTP_DIR):]
+        if self.is_wpt_test(test_name):

[jsbell, 2015/06/04 17:43:25]

Use is_wpt_test var from above?

[burnik, 2015/06/05 12:59:29]

Done. Forgot to commit and repush this the first time. :-/

+            test_dir_prefix = self.WPT_DIR
+        else:
+            test_dir_prefix = self.HTTP_DIR
+
+        relative_path = test_name[len(test_dir_prefix):]
+        hostname, insecure_port, secure_port = self._get_http_host_and_ports_for_test(test_name)
 
         if "/https/" in test_name or ".https." in test_name:
-            return "https://127.0.0.1:8443/" + relative_path
-        return "http://127.0.0.1:8000/" + relative_path
+            return "https://%s:%d/%s" % (hostname, secure_port, relative_path)
+        return "http://%s:%d/%s" % (hostname, insecure_port, relative_path)
 
     def uri_to_test(self, uri):
         """Return the base layout test name for a given URI.
 
         This returns the test name for a given URI, e.g., if you passed in
         "file:///src/LayoutTests/fast/html/keygen.html" it would return
         "fast/html/keygen.html".
 
         """
+
+        # This looks like a bit of a hack, since the uri is used instead of test name.
+        hostname, insecure_port, secure_port = self._get_http_host_and_ports_for_test(uri)
+
         if uri.startswith("file:///"):
             prefix = path.abspath_to_uri(self._port.host.platform, self._port.layout_tests_dir())
             if not prefix.endswith('/'):
                 prefix += '/'
             return uri[len(prefix):]
         if uri.startswith("http://"):
-            return uri.replace('http://127.0.0.1:8000/', self.HTTP_DIR)
+            return uri.replace('http://%s:%d/' % (hostname, insecure_port), self.HTTP_DIR)
         if uri.startswith("https://"):
-            return uri.replace('https://127.0.0.1:8443/', self.HTTP_DIR)
+            return uri.replace('https://%s:%d/' % (hostname, secure_port), self.HTTP_DIR)
         raise NotImplementedError('unknown url type: %s' % uri)
 
     def has_crashed(self):
         if self._server_process is None:
             return False
         if self._crashed_process_name:
             return True
         if self._server_process.has_crashed():
             self._crashed_process_name = self._server_process.name()
             self._crashed_pid = self._server_process.pid()
@@ skipping 107 matching lines @@
         if error_line.startswith("#LEAK - "):
             self._leaked = True
             match = re.match('#LEAK - (\S+) pid (\d+) (.+)\n', error_line)
             self._leak_log = match.group(3)
         return self._leaked
 
     def _command_from_driver_input(self, driver_input):
         # FIXME: performance tests pass in full URLs instead of test names.
         if driver_input.test_name.startswith('http://') or driver_input.test_name.startswith('https://')  or driver_input.test_name == ('about:blank'):
             command = driver_input.test_name
-        elif self.is_http_test(driver_input.test_name):
+        elif self.is_http_test(driver_input.test_name) or self.is_wpt_test(driver_input.test_name):
             command = self.test_to_uri(driver_input.test_name)
         else:
             command = self._port.abspath_for_test(driver_input.test_name)
             if sys.platform == 'cygwin':
                 command = path.cygpath(command)
 
         assert not driver_input.image_hash or driver_input.should_run_pixel_test
 
         # ' is the separator between arguments.
         if self._port.supports_per_test_timeout():
@@ skipping 115 matching lines @@
         self.decoded_content = None
         self.malloc = None
         self.js_heap = None
         self.stdin_path = None
 
     def decode_content(self):
         if self.encoding == 'base64' and self.content is not None:
             self.decoded_content = base64.b64decode(self.content)
         else:
             self.decoded_content = self.content