diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/deno_dir_test.py | 18 | ||||
| -rwxr-xr-x | tools/integration_tests.py | 11 |
2 files changed, 20 insertions, 9 deletions
diff --git a/tools/deno_dir_test.py b/tools/deno_dir_test.py index ce5cffa90..042475a81 100755 --- a/tools/deno_dir_test.py +++ b/tools/deno_dir_test.py @@ -28,17 +28,23 @@ class TestDenoDir(DenoTestCase): self.run_deno() assert not os.path.isdir(deno_dir) + # TODO(bartlomieju): reenable or rewrite these tests + # now all cache directories are lazily created # Run deno with DENO_DIR env flag - self.run_deno(deno_dir) - assert os.path.isdir(deno_dir) - assert os.path.isdir(os.path.join(deno_dir, "deps")) - assert os.path.isdir(os.path.join(deno_dir, "gen")) - rmtree(deno_dir) + # self.run_deno(deno_dir) + # assert os.path.isdir(deno_dir) + # assert os.path.isdir(os.path.join(deno_dir, "deps")) + # assert os.path.isdir(os.path.join(deno_dir, "gen")) + # rmtree(deno_dir) def run_deno(self, deno_dir=None): - cmd = [self.deno_exe, "run", "tests/002_hello.ts"] + cmd = [ + self.deno_exe, "run", + "http://localhost:4545/tests/subdir/print_hello.ts" + ] deno_dir_env = {"DENO_DIR": deno_dir} if deno_dir is not None else None res = run_output(cmd, quiet=True, env=deno_dir_env) + print res.code, res.out, res.err self.assertEqual(res.code, 0) diff --git a/tools/integration_tests.py b/tools/integration_tests.py index 6ce4f3d8b..56f430d76 100755 --- a/tools/integration_tests.py +++ b/tools/integration_tests.py @@ -55,7 +55,12 @@ class TestIntegrations(DenoTestCase): test_abs = os.path.join(tests_path, test_filename) test = read_test(test_abs) exit_code = int(test.get("exit_code", 0)) - args = test.get("args", "").split(" ") + args = test.get("args", None) + + if not args: + return + + args = args.split(" ") check_stderr = str2bool(test.get("check_stderr", "false")) stderr = subprocess.STDOUT if check_stderr else open(os.devnull, 'w') stdin_input = (test.get("input", @@ -87,13 +92,13 @@ class TestIntegrations(DenoTestCase): actual_code = e.returncode actual_out = e.output - self.assertEqual(exit_code, actual_code) - actual_out = strip_ansi_codes(actual_out) if not pattern_match(expected_out, actual_out): # This will always throw since pattern_match failed. self.assertEqual(expected_out, actual_out) + self.assertEqual(exit_code, actual_code) + # Add a methods for each test file in tests_path. for fn in sorted( |