Refactor ServiceWorker tests for inclusion in WPT

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

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
index cfb9b06c59f6ea6141a4c48265e7fb8031803ca6..28a6bd519ebba0a9ffd596c8efa1d1a477090df1 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
@@ -1151,7 +1151,7 @@ class Port(object):
     @staticmethod
     def is_wptserve_test(test):
         """Whether wptserve should be used for a given test if enabled."""
-        return test.startswith("external/wpt/")
+        return "external/wpt/" in test

[tkent, 2017/03/13 06:50:32]

Please add test to base_unittest.py

[qyearsley, 2017/03/14 19:46:10]

Could potentially note that we're looking for this substring anywhere in order
to include virtual tests.

If we want to be more conservative, we could do something like:

return re.match(r'^(virtual/[^/]+/)?external/wpt/.*$')

But this may be more complex than necessary, and we'd want unit tests to make
sure the regular expression is right...

 
     def should_use_wptserve(self, test):
         return self.is_wptserve_test(test)