Introduce WPTServe for running W3C Blink Layout tests

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

 # Copyright (C) 2010 Google Inc. All rights reserved.
 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Szeged
 #
 # 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
@@ skipping 67 matching lines @@
         self._printer = printer
         self._expectations = None
 
         self.HTTP_SUBDIR = 'http' + port.TEST_PATH_SEPARATOR
         self.INSPECTOR_SUBDIR = 'inspector' + port.TEST_PATH_SEPARATOR
         self.PERF_SUBDIR = 'perf'
         self.WEBSOCKET_SUBDIR = 'websocket' + port.TEST_PATH_SEPARATOR
         self.LAYOUT_TESTS_DIRECTORY = 'LayoutTests'
         self.ARCHIVED_RESULTS_LIMIT = 25
         self._http_server_started = False
+        self._wptserve_started = False
         self._websockets_server_started = False
 
         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)
 
     def _collect_tests(self, args):
         return self._finder.find_tests(self._options, args)
 
     def _is_http_test(self, test):
+        if self._port.is_wpt_enabled() and self._port.is_wpt_test(test):
+            return False

[Dirk Pranke, 2015/06/11 23:17:01]

I'm confused, when would a test be both an http test and a wpt_test ? 

[burnik, 2015/06/12 01:40:53]

Whenever a test path matches *http/

e.g.
imported/web-platform-tests/referrer-policy/no-referrer/http-csp/cross-origin/http-http/script-tag/generic.no-redirect.http.html

This prevents from spinning up Apache alongside WPTServe when the list of tests
to run is only under imported/web-platform-tests.

+
         return self.HTTP_SUBDIR in test or self._is_websocket_test(test)
 
     def _is_inspector_test(self, test):
         return self.INSPECTOR_SUBDIR in test
 
     def _is_websocket_test(self, test):
+        if self._port.is_wpt_enabled() and self._port.is_wpt_test(test):
+            return False
+
         return self.WEBSOCKET_SUBDIR in test
 
     def _http_tests(self, test_names):
         return set(test for test in test_names if self._is_http_test(test))
 
     def _is_perf_test(self, test):
         return self.PERF_SUBDIR == test or (self.PERF_SUBDIR + self._port.TEST_PATH_SEPARATOR) in test
 
     def _prepare_lists(self, paths, test_names):
         tests_to_skip = self._finder.skip_tests(paths, test_names, self._expectations, self._http_tests(test_names))
@@ skipping 211 matching lines @@
     def _run_tests(self, tests_to_run, tests_to_skip, repeat_each, iterations, num_workers, retrying):
 
         test_inputs = []
         for _ in xrange(iterations):
             for test in tests_to_run:
                 for _ in xrange(repeat_each):
                     test_inputs.append(self._test_input_for_file(test))
         return self._runner.run_tests(self._expectations, test_inputs, tests_to_skip, num_workers, retrying)
 
     def _start_servers(self, tests_to_run):
+        if self._port.is_wpt_enabled() and any(self._port.is_wpt_test(test) for test in tests_to_run):
+            self._printer.write_update('Starting WPTServe ...')
+            self._port.start_wptserve()
+            self._wptserve_started = True
+
         if self._port.requires_http_server() or any((self._is_http_test(test) or self._is_inspector_test(test)) for test in tests_to_run):
             self._printer.write_update('Starting HTTP server ...')
             self._port.start_http_server(additional_dirs={}, number_of_drivers=self._options.max_locked_shards)
             self._http_server_started = True
 
         if any(self._is_websocket_test(test) for test in tests_to_run):
             self._printer.write_update('Starting WebSocket server ...')
             self._port.start_websocket_server()
             self._websockets_server_started = True
 
     def _stop_servers(self):
+        if self._wptserve_started:
+            self._printer.write_update('Stopping WPTServe ...')
+            self._wptserve_started = False
+            self._port.stop_wptserve()
         if self._http_server_started:
             self._printer.write_update('Stopping HTTP server ...')
             self._http_server_started = False
             self._port.stop_http_server()
         if self._websockets_server_started:
             self._printer.write_update('Stopping WebSocket server ...')
             self._websockets_server_started = False
             self._port.stop_websocket_server()
 
     def _clean_up_run(self):
@@ skipping 140 matching lines @@
             return int(worker_name.split('/')[1]) if worker_name else -1
 
         stats = {}
         for result in initial_results.results_by_name.values():
             if result.type != test_expectations.SKIP:
                 stats[result.test_name] = {'results': (_worker_number(result.worker_name), result.test_number, result.pid, int(result.test_run_time * 1000), int(result.total_run_time * 1000))}
         stats_trie = {}
         for name, value in stats.iteritems():
             json_results_generator.add_path_to_trie(name, value, stats_trie)
         return stats_trie