71 files changed, 14 insertions, 14 deletions

diff --git a/cli/tests/integration_tests.rs b/cli/tests/integration_tests.rs
index 103e3142e..de894f064 100644
--- a/cli/tests/integration_tests.rs
+++ b/cli/tests/integration_tests.rs
@@ -400,7 +400,7 @@ fn js_unit_tests() {
     .arg("--unstable")
     .arg("--reload")
     .arg("-A")
-    .arg("cli/js/tests/unit_test_runner.ts")
+    .arg("cli/tests/unit/unit_test_runner.ts")
     .arg("--master")
     .arg("--verbose")
     .env("NO_COLOR", "1")
diff --git a/cli/js/tests/README.md b/cli/tests/unit/README.md
index ea52f1242..c333b0046 100644
--- a/cli/js/tests/README.md
+++ b/cli/tests/unit/README.md
@@ -42,7 +42,7 @@ ways:
 `unit_test_runner.ts` is the main script used to run unit tests.
 
 Runner discovers required permissions combinations by loading
-`cli/js/tests/unit_tests.ts` and going through all registered instances of
+`cli/tests/unit/unit_tests.ts` and going through all registered instances of
 `unitTest`.
 
 There are three ways to run `unit_test_runner.ts`:
@@ -50,27 +50,27 @@ There are three ways to run `unit_test_runner.ts`:
 ```
 # Run all tests. Spawns worker processes for each discovered permission
 # combination:
-target/debug/deno run -A cli/js/tests/unit_test_runner.ts --master
+target/debug/deno run -A cli/tests/unit/unit_test_runner.ts --master
 
 # By default all output of worker processes is discarded; for debug purposes
 # the --verbose flag preserves output from the worker
-target/debug/deno run -A cli/js/tests/unit_test_runner.ts --master --verbose
+target/debug/deno run -A cli/tests/unit/unit_test_runner.ts --master --verbose
 
 # Run subset of tests that don't require any permissions
-target/debug/deno run --unstable cli/js/tests/unit_test_runner.ts
+target/debug/deno run --unstable cli/tests/unit/unit_test_runner.ts
 
 # Run subset tests that require "net" and "read" permissions
-target/debug/deno run --unstable --allow-net --allow-read cli/js/tests/unit_test_runner.ts
+target/debug/deno run --unstable --allow-net --allow-read cli/tests/unit/unit_test_runner.ts
 
 # "worker" mode communicates with parent using TCP socket on provided address;
 # after initial setup drops permissions to specified set. It shouldn't be used
 # directly, only be "master" process.
-target/debug/deno run -A cli/js/tests/unit_test_runner.ts --worker --addr=127.0.0.1:4500 --perms=net,write,run
+target/debug/deno run -A cli/tests/unit/unit_test_runner.ts --worker --addr=127.0.0.1:4500 --perms=net,write,run
 
 # Run specific tests
-target/debug/deno run --unstable --allow-net cli/js/tests/unit_test_runner.ts -- netTcpListenClose
+target/debug/deno run --unstable --allow-net cli/tests/unit/unit_test_runner.ts -- netTcpListenClose
 
-RUST_BACKTRACE=1 cargo run -- run --unstable --allow-read --allow-write cli/js/tests/unit_test_runner.ts -- netUnixDialListen
+RUST_BACKTRACE=1 cargo run -- run --unstable --allow-read --allow-write cli/tests/unit/unit_test_runner.ts -- netUnixDialListen
 ```
 
 ### Http server
diff --git a/cli/js/tests/abort_controller_test.ts b/cli/tests/unit/abort_controller_test.ts
index ecc1abb88..ecc1abb88 100644
--- a/cli/js/tests/abort_controller_test.ts
+++ b/cli/tests/unit/abort_controller_test.ts
diff --git a/cli/js/tests/blob_test.ts b/cli/tests/unit/blob_test.ts
index 70f8fb3d5..70f8fb3d5 100644
--- a/cli/js/tests/blob_test.ts
+++ b/cli/tests/unit/blob_test.ts
diff --git a/cli/js/tests/body_test.ts b/cli/tests/unit/body_test.ts
index c8f783e04..c8f783e04 100644
--- a/cli/js/tests/body_test.ts
+++ b/cli/tests/unit/body_test.ts
diff --git a/cli/js/tests/buffer_test.ts b/cli/tests/unit/buffer_test.ts
index ac2d7db7b..ac2d7db7b 100644
--- a/cli/js/tests/buffer_test.ts
+++ b/cli/tests/unit/buffer_test.ts
diff --git a/cli/js/tests/build_test.ts b/cli/tests/unit/build_test.ts
index 987ed8d39..987ed8d39 100644
--- a/cli/js/tests/build_test.ts
+++ b/cli/tests/unit/build_test.ts
diff --git a/cli/js/tests/chmod_test.ts b/cli/tests/unit/chmod_test.ts
index d0d17629d..d0d17629d 100644
--- a/cli/js/tests/chmod_test.ts
+++ b/cli/tests/unit/chmod_test.ts
diff --git a/cli/js/tests/chown_test.ts b/cli/tests/unit/chown_test.ts
index 724ea5a21..724ea5a21 100644
--- a/cli/js/tests/chown_test.ts
+++ b/cli/tests/unit/chown_test.ts
diff --git a/cli/js/tests/console_test.ts b/cli/tests/unit/console_test.ts
index 02d71e4ca..02d71e4ca 100644
--- a/cli/js/tests/console_test.ts
+++ b/cli/tests/unit/console_test.ts
diff --git a/cli/js/tests/copy_file_test.ts b/cli/tests/unit/copy_file_test.ts
index 986bab53b..986bab53b 100644
--- a/cli/js/tests/copy_file_test.ts
+++ b/cli/tests/unit/copy_file_test.ts
diff --git a/cli/js/tests/custom_event_test.ts b/cli/tests/unit/custom_event_test.ts
index a8b2fcf88..a8b2fcf88 100644
--- a/cli/js/tests/custom_event_test.ts
+++ b/cli/tests/unit/custom_event_test.ts
diff --git a/cli/js/tests/dir_test.ts b/cli/tests/unit/dir_test.ts
index dc05d9564..dc05d9564 100644
--- a/cli/js/tests/dir_test.ts
+++ b/cli/tests/unit/dir_test.ts
diff --git a/cli/js/tests/dispatch_json_test.ts b/cli/tests/unit/dispatch_json_test.ts
index 4e95b86a2..4e95b86a2 100644
--- a/cli/js/tests/dispatch_json_test.ts
+++ b/cli/tests/unit/dispatch_json_test.ts
diff --git a/cli/js/tests/dispatch_minimal_test.ts b/cli/tests/unit/dispatch_minimal_test.ts
index afc17f4fb..afc17f4fb 100644
--- a/cli/js/tests/dispatch_minimal_test.ts
+++ b/cli/tests/unit/dispatch_minimal_test.ts
diff --git a/cli/js/tests/dom_exception_test.ts b/cli/tests/unit/dom_exception_test.ts
index 2eb7633e1..2eb7633e1 100644
--- a/cli/js/tests/dom_exception_test.ts
+++ b/cli/tests/unit/dom_exception_test.ts
diff --git a/cli/js/tests/dom_iterable_test.ts b/cli/tests/unit/dom_iterable_test.ts
index b9435b3bc..b9435b3bc 100644
--- a/cli/js/tests/dom_iterable_test.ts
+++ b/cli/tests/unit/dom_iterable_test.ts
diff --git a/cli/js/tests/error_stack_test.ts b/cli/tests/unit/error_stack_test.ts
index e5cedfcf5..e5cedfcf5 100644
--- a/cli/js/tests/error_stack_test.ts
+++ b/cli/tests/unit/error_stack_test.ts
diff --git a/cli/js/tests/event_target_test.ts b/cli/tests/unit/event_target_test.ts
index 0c4eb4d0d..0c4eb4d0d 100644
--- a/cli/js/tests/event_target_test.ts
+++ b/cli/tests/unit/event_target_test.ts
diff --git a/cli/js/tests/event_test.ts b/cli/tests/unit/event_test.ts
index ce3076e58..ce3076e58 100644
--- a/cli/js/tests/event_test.ts
+++ b/cli/tests/unit/event_test.ts
diff --git a/cli/js/tests/fetch_test.ts b/cli/tests/unit/fetch_test.ts
index 37fca2112..37fca2112 100644
--- a/cli/js/tests/fetch_test.ts
+++ b/cli/tests/unit/fetch_test.ts
diff --git a/cli/js/tests/file_test.ts b/cli/tests/unit/file_test.ts
index 4941554ad..4941554ad 100644
--- a/cli/js/tests/file_test.ts
+++ b/cli/tests/unit/file_test.ts
diff --git a/cli/js/tests/files_test.ts b/cli/tests/unit/files_test.ts
index a035c7074..a035c7074 100644
--- a/cli/js/tests/files_test.ts
+++ b/cli/tests/unit/files_test.ts
diff --git a/cli/js/tests/form_data_test.ts b/cli/tests/unit/form_data_test.ts
index 10cbd30a7..10cbd30a7 100644
--- a/cli/js/tests/form_data_test.ts
+++ b/cli/tests/unit/form_data_test.ts
diff --git a/cli/js/tests/format_error_test.ts b/cli/tests/unit/format_error_test.ts
index ae7559c82..ae7559c82 100644
--- a/cli/js/tests/format_error_test.ts
+++ b/cli/tests/unit/format_error_test.ts
diff --git a/cli/js/tests/fs_events_test.ts b/cli/tests/unit/fs_events_test.ts
index ad8ba8502..ad8ba8502 100644
--- a/cli/js/tests/fs_events_test.ts
+++ b/cli/tests/unit/fs_events_test.ts
diff --git a/cli/js/tests/get_random_values_test.ts b/cli/tests/unit/get_random_values_test.ts
index 76fa732ea..76fa732ea 100644
--- a/cli/js/tests/get_random_values_test.ts
+++ b/cli/tests/unit/get_random_values_test.ts
diff --git a/cli/js/tests/globals_test.ts b/cli/tests/unit/globals_test.ts
index aa8b4f46e..aa8b4f46e 100644
--- a/cli/js/tests/globals_test.ts
+++ b/cli/tests/unit/globals_test.ts
diff --git a/cli/js/tests/headers_test.ts b/cli/tests/unit/headers_test.ts
index aaa829837..aaa829837 100644
--- a/cli/js/tests/headers_test.ts
+++ b/cli/tests/unit/headers_test.ts
diff --git a/cli/js/tests/internals_test.ts b/cli/tests/unit/internals_test.ts
index abd4c94c3..abd4c94c3 100644
--- a/cli/js/tests/internals_test.ts
+++ b/cli/tests/unit/internals_test.ts
diff --git a/cli/js/tests/io_test.ts b/cli/tests/unit/io_test.ts
index 0ccd83ea2..0ccd83ea2 100644
--- a/cli/js/tests/io_test.ts
+++ b/cli/tests/unit/io_test.ts
diff --git a/cli/js/tests/link_test.ts b/cli/tests/unit/link_test.ts
index c6ea4901e..c6ea4901e 100644
--- a/cli/js/tests/link_test.ts
+++ b/cli/tests/unit/link_test.ts
diff --git a/cli/js/tests/make_temp_test.ts b/cli/tests/unit/make_temp_test.ts
index 59fe8c5f5..59fe8c5f5 100644
--- a/cli/js/tests/make_temp_test.ts
+++ b/cli/tests/unit/make_temp_test.ts
diff --git a/cli/js/tests/metrics_test.ts b/cli/tests/unit/metrics_test.ts
index 9b7d83887..9b7d83887 100644
--- a/cli/js/tests/metrics_test.ts
+++ b/cli/tests/unit/metrics_test.ts
diff --git a/cli/js/tests/mkdir_test.ts b/cli/tests/unit/mkdir_test.ts
index 68755ef4d..68755ef4d 100644
--- a/cli/js/tests/mkdir_test.ts
+++ b/cli/tests/unit/mkdir_test.ts
diff --git a/cli/js/tests/net_test.ts b/cli/tests/unit/net_test.ts
index 9e9a1e5e8..9e9a1e5e8 100644
--- a/cli/js/tests/net_test.ts
+++ b/cli/tests/unit/net_test.ts
diff --git a/cli/js/tests/os_test.ts b/cli/tests/unit/os_test.ts
index e99002534..e99002534 100644
--- a/cli/js/tests/os_test.ts
+++ b/cli/tests/unit/os_test.ts
diff --git a/cli/js/tests/performance_test.ts b/cli/tests/unit/performance_test.ts
index 89b7cad8b..89b7cad8b 100644
--- a/cli/js/tests/performance_test.ts
+++ b/cli/tests/unit/performance_test.ts
diff --git a/cli/js/tests/permissions_test.ts b/cli/tests/unit/permissions_test.ts
index 7528768a1..7528768a1 100644
--- a/cli/js/tests/permissions_test.ts
+++ b/cli/tests/unit/permissions_test.ts
diff --git a/cli/js/tests/process_test.ts b/cli/tests/unit/process_test.ts
index 1ea6f95b7..1ea6f95b7 100644
--- a/cli/js/tests/process_test.ts
+++ b/cli/tests/unit/process_test.ts
diff --git a/cli/js/tests/read_dir_test.ts b/cli/tests/unit/read_dir_test.ts
index 79e2a1507..79e2a1507 100644
--- a/cli/js/tests/read_dir_test.ts
+++ b/cli/tests/unit/read_dir_test.ts
diff --git a/cli/js/tests/read_file_test.ts b/cli/tests/unit/read_file_test.ts
index 0d3cdf422..0d3cdf422 100644
--- a/cli/js/tests/read_file_test.ts
+++ b/cli/tests/unit/read_file_test.ts
diff --git a/cli/js/tests/read_link_test.ts b/cli/tests/unit/read_link_test.ts
index 6821d8dc8..6821d8dc8 100644
--- a/cli/js/tests/read_link_test.ts
+++ b/cli/tests/unit/read_link_test.ts
diff --git a/cli/js/tests/read_text_file_test.ts b/cli/tests/unit/read_text_file_test.ts
index 3e7493e4a..3e7493e4a 100644
--- a/cli/js/tests/read_text_file_test.ts
+++ b/cli/tests/unit/read_text_file_test.ts
diff --git a/cli/js/tests/real_path_test.ts b/cli/tests/unit/real_path_test.ts
index c88955270..c88955270 100644
--- a/cli/js/tests/real_path_test.ts
+++ b/cli/tests/unit/real_path_test.ts
diff --git a/cli/js/tests/remove_test.ts b/cli/tests/unit/remove_test.ts
index 35e5c821e..35e5c821e 100644
--- a/cli/js/tests/remove_test.ts
+++ b/cli/tests/unit/remove_test.ts
diff --git a/cli/js/tests/rename_test.ts b/cli/tests/unit/rename_test.ts
index b4047f906..b4047f906 100644
--- a/cli/js/tests/rename_test.ts
+++ b/cli/tests/unit/rename_test.ts
diff --git a/cli/js/tests/request_test.ts b/cli/tests/unit/request_test.ts
index 8a276c5e7..8a276c5e7 100644
--- a/cli/js/tests/request_test.ts
+++ b/cli/tests/unit/request_test.ts
diff --git a/cli/js/tests/resources_test.ts b/cli/tests/unit/resources_test.ts
index 385905a6e..385905a6e 100644
--- a/cli/js/tests/resources_test.ts
+++ b/cli/tests/unit/resources_test.ts
diff --git a/cli/js/tests/signal_test.ts b/cli/tests/unit/signal_test.ts
index 2f117f8d1..2f117f8d1 100644
--- a/cli/js/tests/signal_test.ts
+++ b/cli/tests/unit/signal_test.ts
diff --git a/cli/js/tests/stat_test.ts b/cli/tests/unit/stat_test.ts
index 7eaf73d58..7eaf73d58 100644
--- a/cli/js/tests/stat_test.ts
+++ b/cli/tests/unit/stat_test.ts
diff --git a/cli/js/tests/streams_piping_test.ts b/cli/tests/unit/streams_piping_test.ts
index a947b3821..a947b3821 100644
--- a/cli/js/tests/streams_piping_test.ts
+++ b/cli/tests/unit/streams_piping_test.ts
diff --git a/cli/js/tests/streams_transform_test.ts b/cli/tests/unit/streams_transform_test.ts
index f3ec148ae..f3ec148ae 100644
--- a/cli/js/tests/streams_transform_test.ts
+++ b/cli/tests/unit/streams_transform_test.ts
diff --git a/cli/js/tests/streams_writable_test.ts b/cli/tests/unit/streams_writable_test.ts
index 54c1624af..54c1624af 100644
--- a/cli/js/tests/streams_writable_test.ts
+++ b/cli/tests/unit/streams_writable_test.ts
diff --git a/cli/js/tests/symlink_test.ts b/cli/tests/unit/symlink_test.ts
index 505a49bab..505a49bab 100644
--- a/cli/js/tests/symlink_test.ts
+++ b/cli/tests/unit/symlink_test.ts
diff --git a/cli/js/tests/test_util.ts b/cli/tests/unit/test_util.ts
index 24186db71..1c5b6ff21 100644
--- a/cli/js/tests/test_util.ts
+++ b/cli/tests/unit/test_util.ts
@@ -327,12 +327,12 @@ unitTest(function permissionsMatches(): void {
 
 /*
  * Ensure all unit test files (e.g. xxx_test.ts) are present as imports in
- * cli/js/tests/unit_tests.ts as it is easy to miss this out
+ * cli/tests/unit/unit_tests.ts as it is easy to miss this out
  */
 unitTest(
   { perms: { read: true } },
   function assertAllUnitTestFilesImported(): void {
-    const directoryTestFiles = [...Deno.readDirSync("./cli/js/tests/")]
+    const directoryTestFiles = [...Deno.readDirSync("./cli/tests/unit/")]
       .map((k) => k.name)
       .filter(
         (file) =>
@@ -342,7 +342,7 @@ unitTest(
           !file!.endsWith("unit_test_runner.ts")
       );
     const unitTestsFile: Uint8Array = Deno.readFileSync(
-      "./cli/js/tests/unit_tests.ts"
+      "./cli/tests/unit/unit_tests.ts"
     );
     const importLines = new TextDecoder("utf-8")
       .decode(unitTestsFile)
@@ -355,7 +355,7 @@ unitTest(
     directoryTestFiles.forEach((dirFile) => {
       if (!importedTestFiles.includes(dirFile!)) {
         throw new Error(
-          "cil/js/tests/unit_tests.ts is missing import of test file: cli/js/" +
+          "cil/tests/unit/unit_tests.ts is missing import of test file: cli/js/" +
             dirFile
         );
       }
diff --git a/cli/js/tests/testing_test.ts b/cli/tests/unit/testing_test.ts
index 854e7161c..854e7161c 100644
--- a/cli/js/tests/testing_test.ts
+++ b/cli/tests/unit/testing_test.ts
diff --git a/cli/js/tests/text_encoding_test.ts b/cli/tests/unit/text_encoding_test.ts
index 87b601f36..87b601f36 100644
--- a/cli/js/tests/text_encoding_test.ts
+++ b/cli/tests/unit/text_encoding_test.ts
diff --git a/cli/js/tests/timers_test.ts b/cli/tests/unit/timers_test.ts
index 7adff0095..7adff0095 100644
--- a/cli/js/tests/timers_test.ts
+++ b/cli/tests/unit/timers_test.ts
diff --git a/cli/js/tests/tls_test.ts b/cli/tests/unit/tls_test.ts
index 3d071441d..3d071441d 100644
--- a/cli/js/tests/tls_test.ts
+++ b/cli/tests/unit/tls_test.ts
diff --git a/cli/js/tests/truncate_test.ts b/cli/tests/unit/truncate_test.ts
index 3fd85c990..3fd85c990 100644
--- a/cli/js/tests/truncate_test.ts
+++ b/cli/tests/unit/truncate_test.ts
diff --git a/cli/js/tests/tty_test.ts b/cli/tests/unit/tty_test.ts
index 116b0dfe9..116b0dfe9 100644
--- a/cli/js/tests/tty_test.ts
+++ b/cli/tests/unit/tty_test.ts
diff --git a/cli/js/tests/umask_test.ts b/cli/tests/unit/umask_test.ts
index bfac65d52..bfac65d52 100644
--- a/cli/js/tests/umask_test.ts
+++ b/cli/tests/unit/umask_test.ts
diff --git a/cli/js/tests/unit_test_runner.ts b/cli/tests/unit/unit_test_runner.ts
index 12d9101b8..715dda500 100755
--- a/cli/js/tests/unit_test_runner.ts
+++ b/cli/tests/unit/unit_test_runner.ts
@@ -96,7 +96,7 @@ function spawnWorkerRunner(
     "run",
     "--unstable", // TODO(ry) be able to test stable vs unstable
     "-A",
-    "cli/js/tests/unit_test_runner.ts",
+    "cli/tests/unit/unit_test_runner.ts",
     "--worker",
     `--addr=${addr}`,
     `--perms=${permStr}`,
diff --git a/cli/js/tests/unit_tests.ts b/cli/tests/unit/unit_tests.ts
index 7327bcc05..7327bcc05 100644
--- a/cli/js/tests/unit_tests.ts
+++ b/cli/tests/unit/unit_tests.ts
diff --git a/cli/js/tests/url_search_params_test.ts b/cli/tests/unit/url_search_params_test.ts
index 7b7dbab76..7b7dbab76 100644
--- a/cli/js/tests/url_search_params_test.ts
+++ b/cli/tests/unit/url_search_params_test.ts
diff --git a/cli/js/tests/url_test.ts b/cli/tests/unit/url_test.ts
index 68fcbd95e..68fcbd95e 100644
--- a/cli/js/tests/url_test.ts
+++ b/cli/tests/unit/url_test.ts
diff --git a/cli/js/tests/utime_test.ts b/cli/tests/unit/utime_test.ts
index 63727ae62..63727ae62 100644
--- a/cli/js/tests/utime_test.ts
+++ b/cli/tests/unit/utime_test.ts
diff --git a/cli/js/tests/version_test.ts b/cli/tests/unit/version_test.ts
index 0417b27de..0417b27de 100644
--- a/cli/js/tests/version_test.ts
+++ b/cli/tests/unit/version_test.ts
diff --git a/cli/js/tests/write_file_test.ts b/cli/tests/unit/write_file_test.ts
index 80f711dbc..80f711dbc 100644
--- a/cli/js/tests/write_file_test.ts
+++ b/cli/tests/unit/write_file_test.ts
diff --git a/cli/js/tests/write_text_file_test.ts b/cli/tests/unit/write_text_file_test.ts
index 321189b0e..321189b0e 100644
--- a/cli/js/tests/write_text_file_test.ts
+++ b/cli/tests/unit/write_text_file_test.ts