Implement support for multi-global tests. (#88)

* Implement support for multi-global tests. CC <web-platform-tests/wpt#2558>. * Make the .any.js and .worker.js handlers more robust against unexpected file names.
w3c · Jul 26, 2016 · 4574b2e · 4574b2e
1 parent 2f34984
commit 4574b2e
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 3 deletions.
diff --git a/manifest/sourcefile.py b/manifest/sourcefile.py
@@ -18,6 +18,15 @@
 
 wd_pattern = "*.py"
 
+def replace_end(s, old, new):
+    """
+    Given a string `s` that ends with `old`, replace that occurrence of `old`
+    with `new`.
+    """
+    assert s.endswith(old)
+    return s[:-len(old)] + new
+
+
 class SourceFile(object):
     parsers = {"html":lambda x:html5lib.parse(x, treebuilder="etree"),
                "xhtml":ElementTree.parse,
@@ -102,6 +111,12 @@ def name_is_manual(self):
         be a manual test file"""
         return self.type_flag == "manual"
 
+    @property
+    def name_is_multi_global(self):
+        """Check if the file name matches the conditions for the file to
+        be a multi-global js test file"""
+        return "any" in self.meta_flags and self.ext == ".js"
+
     @property
     def name_is_worker(self):
         """Check if the file name matches the conditions for the file to
@@ -296,8 +311,14 @@ def manifest_items(self):
         elif self.name_is_manual:
             rv = [ManualTest(self, self.url)]
 
+        elif self.name_is_multi_global:
+            rv = [
+                TestharnessTest(self, replace_end(self.url, ".any.js", ".any.html")),
+                TestharnessTest(self, replace_end(self.url, ".any.js", ".any.worker")),
+            ]
+
         elif self.name_is_worker:
-            rv = [TestharnessTest(self, self.url[:-3])]
+            rv = [TestharnessTest(self, replace_end(self.url, ".worker.js", ".worker"))]
 
         elif self.name_is_webdriver:
             rv = [WebdriverSpecTest(self, self.url)]

diff --git a/manifest/tests/test_manifest.py b/manifest/tests/test_manifest.py
@@ -53,3 +53,10 @@ def test_manifest_to_json():
     assert list(loaded) == list(m)
 
     assert loaded.to_json() == json_str
+
+def test_multi_global():
+    s = sourcefile.SourceFile("/", "test.any.js", "/")
+    assert s.name_is_multi_global
+    assert not s.name_is_manual
+    assert not s.name_is_reference
+    assert not s.name_is_worker
diff --git a/serve/serve.py b/serve/serve.py
@@ -23,6 +23,15 @@
 
 repo_root = localpaths.repo_root
 
+def replace_end(s, old, new):
+    """
+    Given a string `s` that ends with `old`, replace that occurrence of `old`
+    with `new`.
+    """
+    assert s.endswith(old)
+    return s[:-len(old)] + new
+
+
 class WorkersHandler(object):
     def __init__(self):
         self.handler = handlers.handler(self.handle_request)
@@ -31,7 +40,7 @@ def __call__(self, request, response):
         return self.handler(request, response)
 
     def handle_request(self, request, response):
-        worker_path = request.url_parts.path.replace(".worker", ".worker.js")
+        worker_path = replace_end(request.url_parts.path, ".worker", ".worker.js")
         return """<!doctype html>
 <meta charset=utf-8>
 <script src="/resources/testharness.js"></script>
@@ -42,6 +51,52 @@ def handle_request(self, request, response):
 </script>
 """ % (worker_path,)
 
+
+class AnyHtmlHandler(object):
+    def __init__(self):
+        self.handler = handlers.handler(self.handle_request)
+
+    def __call__(self, request, response):
+        return self.handler(request, response)
+
+    def handle_request(self, request, response):
+        test_path = replace_end(request.url_parts.path, ".any.html", ".any.js")
+        return """\
+<!doctype html>
+<meta charset=utf-8>
+<script>
+self.GLOBAL = {
+  isWindow: function() { return true; },
+  isWorker: function() { return false; },
+};
+</script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+<script src="%s"></script>
+""" % (test_path,)
+
+
+class AnyWorkerHandler(object):
+    def __init__(self):
+        self.handler = handlers.handler(self.handle_request)
+
+    def __call__(self, request, response):
+        return self.handler(request, response)
+
+    def handle_request(self, request, response):
+        test_path = replace_end(request.url_parts.path, ".any.worker.js", ".any.js")
+        return """\
+self.GLOBAL = {
+  isWindow: function() { return false; },
+  isWorker: function() { return true; },
+};
+importScripts("/resources/testharness.js");
+importScripts("%s");
+done();
+""" % (test_path,)
+
+
 rewrites = [("GET", "/resources/WebIDLParser.js", "/resources/webidl2/lib/webidl2.js")]
 
 subdomains = [u"www",
@@ -61,7 +116,11 @@ def __init__(self):
                           ("*", "{spec}/tools/*", handlers.ErrorHandler(404)),
                           ("*", "/serve.py", handlers.ErrorHandler(404))]
 
-        self.static = [("GET", "*.worker", WorkersHandler())]
+        self.static = [
+            ("GET", "*.worker", WorkersHandler()),
+            ("GET", "*.any.html", AnyHtmlHandler()),
+            ("GET", "*.any.worker.js", AnyWorkerHandler()),
+        ]
 
         self.mountpoint_routes = OrderedDict()