fixup! Update manifest to support reftest chains.

README.md

@@ -135,14 +135,14 @@ which you've noted an interoperability bug in a browser.
 
 The way to contribute is just as usual:
 
-* fork this repository (and make sure you're still relatively in sync
-  with it if you forked a while ago);
-* create a branch for your changes:
+* Fork this repository (and make sure you're still relatively in sync
+  with it if you forked a while ago)
+* Create a branch for your changes:
   `git checkout -b your-name/topic`;
-* make your changes;
+* Make your changes
 * Run the lint script described below
-* Commit locally push that to your repo;
-* and send in a pull request based on the above.
+* Commit locally and push that to your repo
+* Send in a pull request based on the above.
 
 A lint is available to test for common mistakes in testcases. It can
 be run with:
@@ -162,7 +162,7 @@ Adding command-line scripts ("tools" subdirs)
 
 Sometimes you may want to add a script to the repository that's meant
 to be used from the command line, not from a browser (e.g., a script
-for generating test files). If you want to ensure (e.g., or security
+for generating test files). If you want to ensure (e.g., for security
 reasons) that such scripts won't be handled by the HTTP server, but
 will instead only be usable from the command line, then place them in
 either:

docs/reftests.md

@@ -32,13 +32,13 @@ only passes if the *test* and *reference* have pixel-perfect identical
 rendering. `rel="mismatch"` inverts this so the test only passes when
 the renderings differ.
 
-In general the files used in a reftest should follow the follow the
+In general the files used in a reftest should follow the
 [format][format] and [style][style] guidelines. The *test* should also
 be [self-describing][selfdesc], to allow a human to determine whether
 the the rendering is as expected.
 
 Note that references can be shared between tests; this is strongly
-encouraged since it permits optimisations when running tests.
+encouraged since it permits optimizations when running tests.
 
 ## Controlling When Comparison Occurs
 

docs/submission-process.md

@@ -20,7 +20,7 @@ on, e.g. `git checkout -b topic-name`
 
 * Push your local branch to your GitHub repository
 
-* Using the GitHub UI create a PUll Request for your branch.
+* Using the GitHub UI create a Pull Request for your branch.
 
 * When you get review comments, make more commits to your branch to
   address the comments (**note**: Do *not* rewrite existing commits using

tools/lint/lint.py

@@ -5,13 +5,8 @@
 import fnmatch
 
 from collections import defaultdict
-try:
-    from xml.etree import cElementTree as ElementTree
-except ImportError:
-    from xml.etree import ElementTree
 
 from .. import localpaths
-import html5lib
 from manifest.sourcefile import SourceFile
 
 here = os.path.abspath(os.path.split(__file__)[0])

tools/manifest/__init__.py

@@ -1,5 +1,5 @@
-import manifest
-import update
-import tree
 import item
+import manifest
 import sourcefile
+import tree
+import update

tools/manifest/item.py

@@ -3,6 +3,8 @@
 
 from utils import url_to_rel_path
 
+item_types = ["testharness", "reftest", "manual", "stub", "wdspec"]
+
 class ManifestItem(object):
     __metaclass__ = ABCMeta
 

tools/manifest/manifest.py

@@ -2,14 +2,14 @@
 import os
 from collections import defaultdict
 
-from item import ManualTest, WebdriverSpecTest, Stub, RefTest, TestharnessTest
+from item import item_types, ManualTest, WebdriverSpecTest, Stub, RefTest, TestharnessTest
 from log import get_logger
 from sourcefile import SourceFile
 
+
 class ManifestError(Exception):
     pass
 
-item_types = ["testharness", "reftest", "manual", "stub", "wdspec"]
 
 class Manifest(object):
     def __init__(self, git_rev=None, url_base="/"):

tools/manifest/sourcefile.py

@@ -89,29 +89,31 @@ def markup_type(self):
             ext = ext[1:]
         if ext in ["html", "htm"]:
             return "html"
-        elif ext in ["xhtml", "xht"]:
+        if ext in ["xhtml", "xht"]:
             return "xhtml"
-        elif ext == "svg":
+        if ext == "svg":
             return "svg"
         return None
 
     @cached_property
     def root(self):
-        if self.markup_type:
-            parser = self.parsers[self.markup_type]
+        if not self.markup_type:
+            return None
+
+        parser = self.parsers[self.markup_type]
 
-            with self.open() as f:
-                try:
-                    tree = parser(f)
-                except Exception:
-                    return None
+        with self.open() as f:
+            try:
+                tree = parser(f)
+            except Exception:
+                return None
 
-            if hasattr(tree, "getroot"):
-                root = tree.getroot()
-            else:
-                root = tree
+        if hasattr(tree, "getroot"):
+            root = tree.getroot()
+        else:
+            root = tree
 
-            return root
+        return root
 
     @cached_property
     def timeout_nodes(self):
@@ -139,15 +141,15 @@ def content_is_testharness(self):
 
     @cached_property
     def reftest_nodes(self):
+        if not self.root:
+            return []
+
         match_links = self.root.findall(".//{http://www.w3.org/1999/xhtml}link[@rel='match']")
         mismatch_links = self.root.findall(".//{http://www.w3.org/1999/xhtml}link[@rel='mismatch']")
         return match_links + mismatch_links
 
     @cached_property
     def references(self):
-        if not self.root:
-            return []
-
         rv = []
         rel_map = {"match": "==", "mismatch": "!="}
         for item in self.reftest_nodes:
@@ -159,9 +161,6 @@ def references(self):
 
     @cached_property
     def content_is_ref_node(self):
-        if not self.root:
-            return False
-
         return bool(self.references)
 
     def manifest_items(self):

tools/serve/serve.py

@@ -1,6 +1,5 @@
  # -*- coding: utf-8 -*-
 import argparse
-import imp
 import json
 import os
 import signal