Remove the remaining traces of content tests.

CONTRIBUTING.md

@@ -28,7 +28,7 @@ If you're looking for easy bugs, have a look at the [E-Easy issue tag](https://g
   comment, or you can ask for a review in `#servo` on `irc.mozilla.org`.
 
 - Add tests relevant to the fixed bug or new feature.  For a DOM change this
-  will usually be a content test; for layout, a reftest.  See our [testing
+  will usually be a web platform test; for layout, a reftest.  See our [testing
   guide](https://github.com/mozilla/servo/wiki/Testing) for more information.
 
 For specific git instructions, see [GitHub & Critic PR handling 101](https://github.com/mozilla/servo/wiki/Github-&-Critic-PR-handling-101).

ORGANIZATION.md

@@ -30,8 +30,6 @@ special integration:
 
 ## Tests
 
-* `tests/contenttest.rs`: Content (JavaScript) test runner.
-* `tests/content`: Content tests.
 * `tests/reftest.rs`: Reference (layout) test runner.
 * `tests/ref`: Reference tests.
 * `tests/html`: Manual test cases and examples.

components/servo/Cargo.toml

@@ -27,11 +27,6 @@ harness = false
 [dependencies.png]
 git = "https://github.com/servo/rust-png"
 
-[[test]]
-name = "contenttest"
-path = "../../tests/contenttest.rs"
-harness = false
-
 [features]
 default = ["glutin_app", "window"]
 window = ["glutin_app/window"]

python/servo/testing_commands.py

@@ -64,7 +64,6 @@ def infer_test_by_dir(self, params):
 
         test_dirs = [
             # path, mach test command, optional flag for path argument
-            (path.join("tests", "content"), "test-content", None),
             (path.join("tests", "wpt"), "test-wpt", None),
             (path.join("tests", "ref"), "test-ref", ["--name"]),
         ]
@@ -93,7 +92,7 @@ def test(self, params):
             return self.infer_test_by_dir(params)
 
         test_start = time()
-        for t in ["tidy", "ref", "content", "wpt", "css", "unit"]:
+        for t in ["tidy", "ref", "wpt", "css", "unit"]:
             Registrar.dispatch("test-%s" % t, context=self.context)
         elapsed = time() - test_start
 
@@ -163,23 +162,10 @@ def test_ref(self, kind=None, name=None, servo_params=None):
     @Command('test-content',
              description='Run the content tests',
              category='testing')
-    @CommandArgument('test_name', default=None, nargs="?",
-                     help="Only run tests that match this pattern")
-    def test_content(self, test_name=None):
-        self.ensure_bootstrapped()
-        self.ensure_built_tests()
-        test_path = path.join(self.context.topdir, "tests", "content")
-        test_args = ["--source-dir=%s" % test_path]
-
-        if test_name is not None:
-            test_args.append(test_name)
-
-        test_start = time()
-        ret = self.run_test("contenttest", test_args)
-        elapsed = time() - test_start
-
-        print("Content tests completed in %0.2fs" % elapsed)
-        return ret
+    def test_content(self):
+        print("Content tests have been replaced by web-platform-tests under "
+              "tests/wpt/mozilla/.")
+        return 0
 
     @Command('test-tidy',
              description='Run the source code tidiness check',