Remove the remaining traces of content tests.

1 files changed, 5 insertions, 19 deletions

diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
index e538c79c789..b93d3689700 100644
--- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -64,7 +64,6 @@ class MachCommands(CommandBase):
 
         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 @@ class MachCommands(CommandBase):
             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 @@ class MachCommands(CommandBase):
     @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',