Reorg tests

Cargo.toml

@@ -1,6 +1,7 @@
 [workspace]
 members = [
   "cli",
+  "cli/tty_tests",
   "core",
   "tools/hyper_hello",
   "deno_typescript",

cli/main.rs

@@ -20,6 +20,8 @@ extern crate url;
 
 #[cfg(test)]
 mod integration_tests;
+#[cfg(test)]
+mod misc_tests;
 
 mod ansi;
 mod assets;

cli/misc_tests.rs

@@ -0,0 +1,63 @@
+// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
+use std::process::Command;
+
+fn run_python_script(script: &str) -> bool {
+  let mut child = Command::new("python")
+    .current_dir("../")
+    .arg(script)
+    .spawn()
+    .expect("failed to spawn script");
+
+  let ecode = child.wait().expect("failed to wait for the child process");
+
+  ecode.success()
+}
+
+#[test]
+fn benchmark_test() {
+  assert!(run_python_script("tools/benchmark_test.py"))
+}
+
+#[test]
+fn deno_dir_test() {
+  assert!(run_python_script("tools/deno_dir_test.py"))
+}
+
+// TODO(#2933): Rewrite this test in rust.
+#[test]
+fn fetch_test() {
+  assert!(run_python_script("tools/fetch_test.py"))
+}
+
+// TODO(#2933): Rewrite this test in rust.
+#[test]
+fn fmt_test() {
+  assert!(run_python_script("tools/fmt_test.py"))
+}
+
+// TODO(#2933): Rewrite this test in rust.
+#[test]
+fn js_unit_tests() {
+  assert!(run_python_script("tools/unit_tests.py"))
+}
+
+// TODO(#2933): Rewrite this test in rust.
+#[test]
+fn repl_test() {
+  assert!(run_python_script("tools/repl_test.py"))
+}
+
+#[test]
+fn setup_test() {
+  assert!(run_python_script("tools/setup_test.py"))
+}
+
+#[test]
+fn target_test() {
+  assert!(run_python_script("tools/target_test.py"))
+}
+
+#[test]
+fn util_test() {
+  assert!(run_python_script("tools/util_test.py"))
+}

cli/tty_tests/Cargo.toml

@@ -0,0 +1,8 @@
+# Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
+[lib]
+path = "lib.rs"
+
+[package]
+name = "deno_tty_tests"
+version = "0.18.0"
+edition = "2018"

cli/tty_tests/lib.rs

@@ -0,0 +1,23 @@
+// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
+use std::process::Command;
+
+pub fn run_python_script(script: &str) -> bool {
+  let mut child = Command::new("python")
+    .current_dir("../../")
+    .arg(script)
+    .spawn()
+    .expect("failed to spawn script");
+
+  let ecode = child.wait().expect("failed to wait for the child process");
+
+  ecode.success()
+}
+
+// TODO(#2933): Rewrite these tests in rust.
+#[test]
+fn tty_tests() {
+  // FIXME: These tests can't run in parallel.
+  assert!(run_python_script("tools/complex_permissions_test.py"));
+  assert!(run_python_script("tools/is_tty_test.py"));
+  assert!(run_python_script("tools/permission_prompt_test.py"));
+}

tools/complex_permissions_test.py

@@ -215,5 +215,4 @@ def complex_permissions_tests():
 
 
 if __name__ == "__main__":
-    with http_server.spawn():
-        run_tests()
+    run_tests()

tools/fetch_test.py

@@ -29,5 +29,4 @@ def test_fetch(self):
 
 
 if __name__ == "__main__":
-    with http_server.spawn():
-        run_tests()
+    run_tests()

tools/target_test.py

@@ -21,14 +21,6 @@ def _test(self, executable):
         self.check_exists(bin_file)
         run([bin_file], quiet=True)
 
-    def test_cargo_test(self):
-        cargo_test = ["cargo", "test", "--all", "--locked"]
-        if "DENO_BUILD_MODE" in os.environ and \
-          os.environ["DENO_BUILD_MODE"] == "release":
-            run(cargo_test + ["--release"])
-        else:
-            run(cargo_test)
-
     def test_libdeno(self):
         self._test("libdeno_test")
 

tools/test.py

@@ -4,24 +4,9 @@
 # Usage: ./tools/test.py out/Debug
 import os
 
-from benchmark_test import TestBenchmark
-from deno_dir_test import TestDenoDir
-from fetch_test import TestFetch
-from fmt_test import TestFmt
-from repl_test import TestRepl
-from setup_test import TestSetup
-from target_test import TestTarget
-from unit_tests import JsUnitTests
-from util_test import TestUtil
-# NOTE: These tests are skipped on Windows
-from is_tty_test import TestIsTty
-from permission_prompt_test import permission_prompt_tests
-from complex_permissions_test import complex_permissions_tests
-
 import http_server
-from util import (enable_ansi_colors, build_path, RESET, FG_RED, FG_GREEN,
-                  executable_suffix, rmtree, tests_path)
-from test_util import parse_test_args, run_tests
+from util import enable_ansi_colors, rmtree, run
+from test_util import parse_test_args
 
 
 def main():
@@ -34,25 +19,14 @@ def main():
 
     enable_ansi_colors()
 
-    test_cases = [
-        TestSetup,
-        TestUtil,
-        TestTarget,
-        JsUnitTests,
-        TestFetch,
-        TestRepl,
-        TestDenoDir,
-        TestBenchmark,
-        TestIsTty,
-    ]
-    test_cases += permission_prompt_tests()
-    test_cases += complex_permissions_tests()
-    # It is very slow, so do TestFmt at the end.
-    test_cases += [TestFmt]
-
-    with http_server.spawn():
-        run_tests(test_cases)
+    cargo_test = ["cargo", "test", "--locked"]
+    if "DENO_BUILD_MODE" in os.environ and \
+      os.environ["DENO_BUILD_MODE"] == "release":
+        run(cargo_test + ["--release"])
+    else:
+        run(cargo_test)
 
 
 if __name__ == '__main__':
-    main()
+    with http_server.spawn():
+        main()

tools/unit_tests.py

@@ -24,5 +24,4 @@ def test_unit_test_runner(self):
 
 
 if __name__ == '__main__':
-    with http_server.spawn():
-        run_tests()
+    run_tests()