Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py |
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py |
index d7243538bfbca80bbe910ea2894ba34d84cb3729..f2531586b102984d0bcc3841e50d7cc2a4e8f3dc 100644 |
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py |
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py |
@@ -41,6 +41,7 @@ import datetime |
import json |
import logging |
import random |
+import re |
import sys |
import time |
@@ -84,8 +85,8 @@ class Manager(object): |
self.INSPECTOR_SUBDIR = 'inspector' + port.TEST_PATH_SEPARATOR |
self.PERF_SUBDIR = 'perf' |
self.WEBSOCKET_SUBDIR = 'websocket' + port.TEST_PATH_SEPARATOR |
- self.VIRTUAL_HTTP_SUBDIR = port.TEST_PATH_SEPARATOR.join([ |
- 'virtual', 'stable', 'http']) |
+ self.VIRTUAL_HTTP_SUBDIR_PATTERN = re.escape( |
+ port.TEST_PATH_SEPARATOR).join(['virtual', '.*', 'http']) |
self.LAYOUT_TESTS_DIRECTORY = 'LayoutTests' |
self.ARCHIVED_RESULTS_LIMIT = 25 |
self._http_server_started = False |
@@ -225,7 +226,7 @@ class Manager(object): |
return ( |
test.startswith(self.HTTP_SUBDIR) or |
self._is_websocket_test(test) or |
- self.VIRTUAL_HTTP_SUBDIR in test |
+ bool(re.match(self.VIRTUAL_HTTP_SUBDIR_PATTERN, test)) |
) |
def _is_inspector_test(self, test): |