Chromium Code Reviews| Index: Tools/Scripts/webkitpy/layout_tests/controllers/manager.py | 
| diff --git a/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py b/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py | 
| index 41100e70c5a8da2566c4ebec7da28e03868760fa..bd16eed59cde55a3fc399376c3c0033dfddb429b 100644 | 
| --- a/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py | 
| +++ b/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py | 
| @@ -85,6 +85,7 @@ class Manager(object): | 
| 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() | 
| @@ -332,6 +333,11 @@ class Manager(object): | 
| 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) | 
| @@ -343,6 +349,10 @@ class Manager(object): | 
| 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 | 
| @@ -352,6 +362,7 @@ class Manager(object): | 
| self._websockets_server_started = False | 
| self._port.stop_websocket_server() | 
| + | 
| 
 
Dirk Pranke
2015/06/05 18:27:48
nit: you only need one blank line between class me
 
burnik
2015/06/08 12:37:01
Done.
 
 | 
| def _clean_up_run(self): | 
| _log.debug("Flushing stdout") | 
| sys.stdout.flush() |