1 files changed, 9 insertions, 49 deletions
diff --git a/tools/unit_tests.py b/tools/unit_tests.py
index 14284b325..10f6a4a47 100755
--- a/tools/unit_tests.py
+++ b/tools/unit_tests.py
@@ -1,67 +1,27 @@
 #!/usr/bin/env python
 # Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-import util
 import sys
 import subprocess
-import re
+import http_server
 
 
-def run_unit_test2(cmd):
+def unit_tests(deno_exe):
+    cmd = [
+        deno_exe, "run", "--reload", "--allow-run", "js/unit_test_runner.ts"
+    ]
     process = subprocess.Popen(
-        cmd,
-        bufsize=1,
-        universal_newlines=True,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT)
-    (actual, expected) = util.parse_unit_test_output(process.stdout, True)
-    process.wait()
-    errcode = process.returncode
-    if errcode != 0:
-        sys.exit(errcode)
-    # To avoid the case where we silently filter out all tests.
-    assert expected > 0
-    if actual == None and expected == None:
-        raise AssertionError("Bad js/unit_test.ts output")
-    if expected != actual:
-        print "expected", expected, "actual", actual
-        raise AssertionError("expected tests did not equal actual")
+        cmd, bufsize=1, universal_newlines=True, stderr=subprocess.STDOUT)
+
     process.wait()
     errcode = process.returncode
     if errcode != 0:
         sys.exit(errcode)
 
 
-def run_unit_test(deno_exe, permStr, flags=None):
-    if flags is None:
-        flags = []
-    cmd = [deno_exe, "run"] + flags + ["js/unit_tests.ts", permStr]
-    run_unit_test2(cmd)
-
-
-# We want to test many ops in deno which have different behavior depending on
-# the permissions set. These tests can specify which permissions they expect,
-# which appends a special string like "permW1N0" to the end of the test name.
-# Here we run several copies of deno with different permissions, filtering the
-# tests by the special string. permW1N0 means allow-write but not allow-net.
-# See js/test_util.ts for more details.
-def unit_tests(deno_exe):
-    run_unit_test(deno_exe, "permR0W0N0E0U0H0", ["--reload"])
-    run_unit_test(deno_exe, "permR1W0N0E0U0H0", ["--allow-read"])
-    run_unit_test(deno_exe, "permR0W1N0E0U0H0", ["--allow-write"])
-    run_unit_test(deno_exe, "permR0W0N1E0U0H0", ["--allow-net"])
-    run_unit_test(deno_exe, "permR1W1N0E0U0H0",
-                  ["--allow-read", "--allow-write"])
-    run_unit_test(deno_exe, "permR0W0N0E1U0H0", ["--allow-env"])
-    run_unit_test(deno_exe, "permR0W0N0E0U0H1", ["--allow-high-precision"])
-    run_unit_test(deno_exe, "permR0W0N0E0U1H0", ["--allow-run"])
-    run_unit_test(deno_exe, "permR0W1N0E0U1H0",
-                  ["--allow-run", "--allow-write"])
-    # TODO We might accidentally miss some. We should be smarter about which we
-    # run. Maybe we can use the "filtered out" number to check this.
-
-
 if __name__ == '__main__':
     if len(sys.argv) < 2:
         print "Usage ./tools/unit_tests.py target/debug/deno"
         sys.exit(1)
+
+    http_server.spawn()
     unit_tests(sys.argv[1])