chore: move `test_util` to `tests/util/server` (#22444)

As discussed with @mmastrac.

---------

Signed-off-by: Asher Gomez <ashersaupingomez@gmail.com>
Co-authored-by: Matt Mastracci <matthew@mastracci.com>

30 files changed, 20 insertions, 16 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 5b26beca8..f97bbf340 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -644,7 +644,7 @@ dependencies = [
  "pretty_assertions",
  "serde",
  "serde_repr",
- "test_util",
+ "test_server",
  "tokio",
  "tokio-util",
  "tower-lsp",
@@ -1090,7 +1090,7 @@ dependencies = [
  "shell-escape",
  "tar",
  "tempfile",
- "test_util",
+ "test_server",
  "text-size",
  "text_lines",
  "thiserror",
@@ -1758,7 +1758,7 @@ dependencies = [
  "rustyline",
  "serde",
  "signal-hook-registry",
- "test_util",
+ "test_server",
  "tokio",
  "tokio-metrics",
  "uuid",
@@ -6378,7 +6378,7 @@ name = "test_ffi"
 version = "0.1.0"
 dependencies = [
  "pretty_assertions",
- "test_util",
+ "test_server",
 ]
 
 [[package]]
@@ -6387,11 +6387,11 @@ version = "0.1.0"
 dependencies = [
  "napi-build",
  "napi-sys",
- "test_util",
+ "test_server",
 ]
 
 [[package]]
-name = "test_util"
+name = "test_server"
 version = "0.1.0"
 dependencies = [
  "anyhow",
diff --git a/Cargo.toml b/Cargo.toml
index 00bbd725d..113880a0c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,10 +28,10 @@ members = [
   "ext/websocket",
   "ext/webstorage",
   "runtime",
-  "test_util",
   "tests",
   "tests/ffi",
   "tests/napi",
+  "tests/util/server",
 ]
 exclude = ["tests/util/std/hash/_wasm"]
 
@@ -51,7 +51,7 @@ deno_media_type = { version = "0.1.1", features = ["module_specifier"] }
 deno_runtime = { version = "0.146.0", path = "./runtime" }
 deno_terminal = "0.1.1"
 napi_sym = { version = "0.68.0", path = "./cli/napi/sym" }
-test_util = { path = "./test_util" }
+test_util = { package = "test_server", path = "./tests/util/server" }
 
 denokv_proto = "0.5.0"
 denokv_remote = "0.5.0"
diff --git a/cli/tsc/mod.rs b/cli/tsc/mod.rs
index f3f974690..56755b518 100644
--- a/cli/tsc/mod.rs
+++ b/cli/tsc/mod.rs
@@ -1001,8 +1001,8 @@ mod tests {
   // be used again after the snapshot is taken. We should figure out a mechanism
   // to allow removing some of the ops before taking a snapshot.
   #[ignore]
-  #[test]
-  fn test_compiler_snapshot() {
+  #[tokio::test]
+  async fn test_compiler_snapshot() {
     let mut js_runtime = JsRuntime::new(RuntimeOptions {
       startup_snapshot: Some(compiler_snapshot()),
       ..Default::default()
@@ -1027,8 +1027,8 @@ mod tests {
     assert_eq!(actual, "11905938177474799758");
   }
 
-  #[test]
-  fn test_hash_url() {
+  #[tokio::test]
+  async fn test_hash_url() {
     let specifier = deno_core::resolve_url(
       "data:application/javascript,console.log(\"Hello%20Deno\");",
     )
diff --git a/tests/testdata/npm/README.md b/tests/testdata/npm/README.md
index ba3f5f771..bb4a3bad3 100644
--- a/tests/testdata/npm/README.md
+++ b/tests/testdata/npm/README.md
@@ -4,7 +4,7 @@ This folder contains test data for npm specifiers.
 
 ## Registry
 
-The registry is served by the test server (server in test_util) at
+The registry is served by the test server (server in `tests/util/server`) at
 http://localhost:4545/npm/registry/ via the `./registry` folder.
 
 ### Updating with real npm packages
diff --git a/test_util/Cargo.toml b/tests/util/server/Cargo.toml
index e46c308b6..fbec0e1aa 100644
--- a/test_util/Cargo.toml
+++ b/tests/util/server/Cargo.toml
@@ -1,7 +1,7 @@
 # Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
 [package]
-name = "test_util"
+name = "test_server"
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
diff --git a/test_util/src/assertions.rs b/tests/util/server/src/assertions.rs
index b9aba9354..b9aba9354 100644
--- a/test_util/src/assertions.rs
+++ b/tests/util/server/src/assertions.rs
diff --git a/test_util/src/builders.rs b/tests/util/server/src/builders.rs
index d8c209dd7..d8c209dd7 100644
--- a/test_util/src/builders.rs
+++ b/tests/util/server/src/builders.rs
diff --git a/test_util/src/factory.rs b/tests/util/server/src/factory.rs
index 5b796fbc1..5b796fbc1 100644
--- a/test_util/src/factory.rs
+++ b/tests/util/server/src/factory.rs
diff --git a/test_util/src/fs.rs b/tests/util/server/src/fs.rs
index 0e47a7503..0e47a7503 100644
--- a/test_util/src/fs.rs
+++ b/tests/util/server/src/fs.rs
diff --git a/test_util/src/https.rs b/tests/util/server/src/https.rs
index 576df6d52..576df6d52 100644
--- a/test_util/src/https.rs
+++ b/tests/util/server/src/https.rs
diff --git a/test_util/src/lib.rs b/tests/util/server/src/lib.rs
index e4549154d..65dfe61ec 100644
--- a/test_util/src/lib.rs
+++ b/tests/util/server/src/lib.rs
@@ -68,6 +68,10 @@ pub fn root_path() -> PathRef {
   PathRef::new(
     PathBuf::from(concat!(env!("CARGO_MANIFEST_DIR")))
       .parent()
+      .unwrap()
+      .parent()
+      .unwrap()
+      .parent()
       .unwrap(),
   )
 }
diff --git a/test_util/src/lsp.rs b/tests/util/server/src/lsp.rs
index 6b8256fc1..6b8256fc1 100644
--- a/test_util/src/lsp.rs
+++ b/tests/util/server/src/lsp.rs
diff --git a/test_util/src/macros.rs b/tests/util/server/src/macros.rs
index 7cfedcc7e..7cfedcc7e 100644
--- a/test_util/src/macros.rs
+++ b/tests/util/server/src/macros.rs
diff --git a/test_util/src/npm.rs b/tests/util/server/src/npm.rs
index 7469e9b9e..7469e9b9e 100644
--- a/test_util/src/npm.rs
+++ b/tests/util/server/src/npm.rs
diff --git a/test_util/src/pty.rs b/tests/util/server/src/pty.rs
index 3e3331b84..3e3331b84 100644
--- a/test_util/src/pty.rs
+++ b/tests/util/server/src/pty.rs
diff --git a/test_util/src/servers/grpc.rs b/tests/util/server/src/servers/grpc.rs
index 144afc06a..144afc06a 100644
--- a/test_util/src/servers/grpc.rs
+++ b/tests/util/server/src/servers/grpc.rs
diff --git a/test_util/src/servers/hyper_utils.rs b/tests/util/server/src/servers/hyper_utils.rs
index ea15bba0e..ea15bba0e 100644
--- a/test_util/src/servers/hyper_utils.rs
+++ b/tests/util/server/src/servers/hyper_utils.rs
diff --git a/test_util/src/servers/mod.rs b/tests/util/server/src/servers/mod.rs
index f828f1bd4..f828f1bd4 100644
--- a/test_util/src/servers/mod.rs
+++ b/tests/util/server/src/servers/mod.rs
diff --git a/test_util/src/servers/registry.rs b/tests/util/server/src/servers/registry.rs
index 0efe06217..0efe06217 100644
--- a/test_util/src/servers/registry.rs
+++ b/tests/util/server/src/servers/registry.rs
diff --git a/test_util/src/servers/ws.rs b/tests/util/server/src/servers/ws.rs
index 815119b6a..815119b6a 100644
--- a/test_util/src/servers/ws.rs
+++ b/tests/util/server/src/servers/ws.rs
diff --git a/test_util/src/spawn.rs b/tests/util/server/src/spawn.rs
index bfd83e9b2..bfd83e9b2 100644
--- a/test_util/src/spawn.rs
+++ b/tests/util/server/src/spawn.rs
diff --git a/test_util/src/test_server.rs b/tests/util/server/src/test_server.rs
index 6fc86f415..b0f74d606 100644
--- a/test_util/src/test_server.rs
+++ b/tests/util/server/src/test_server.rs
@@ -1,5 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
 fn main() {
-  test_util::servers::run_all_servers();
+  test_server::servers::run_all_servers();
 }
diff --git a/test_util/src/testdata/strace_summary.out b/tests/util/server/src/testdata/strace_summary.out
index 7984b175a..7984b175a 100644
--- a/test_util/src/testdata/strace_summary.out
+++ b/tests/util/server/src/testdata/strace_summary.out
diff --git a/test_util/src/testdata/strace_summary2.out b/tests/util/server/src/testdata/strace_summary2.out
index 798a06665..798a06665 100644
--- a/test_util/src/testdata/strace_summary2.out
+++ b/tests/util/server/src/testdata/strace_summary2.out
diff --git a/test_util/src/testdata/strace_summary3.out b/tests/util/server/src/testdata/strace_summary3.out
index c0cb844ca..c0cb844ca 100644
--- a/test_util/src/testdata/strace_summary3.out
+++ b/tests/util/server/src/testdata/strace_summary3.out
diff --git a/test_util/src/testdata/time.out b/tests/util/server/src/testdata/time.out
index 3ff409bd7..3ff409bd7 100644
--- a/test_util/src/testdata/time.out
+++ b/tests/util/server/src/testdata/time.out
diff --git a/test_util/src/testdata/wrk1.txt b/tests/util/server/src/testdata/wrk1.txt
index 8ad7cf739..8ad7cf739 100644
--- a/test_util/src/testdata/wrk1.txt
+++ b/tests/util/server/src/testdata/wrk1.txt
diff --git a/test_util/src/testdata/wrk2.txt b/tests/util/server/src/testdata/wrk2.txt
index 4b68c6c8a..4b68c6c8a 100644
--- a/test_util/src/testdata/wrk2.txt
+++ b/tests/util/server/src/testdata/wrk2.txt
diff --git a/test_util/src/testdata/wrk3.txt b/tests/util/server/src/testdata/wrk3.txt
index 4c115a096..4c115a096 100644
--- a/test_util/src/testdata/wrk3.txt
+++ b/tests/util/server/src/testdata/wrk3.txt
diff --git a/tools/release/deno_workspace.ts b/tools/release/deno_workspace.ts
index 7e249cf2d..e55a02b73 100644
--- a/tools/release/deno_workspace.ts
+++ b/tools/release/deno_workspace.ts
@@ -35,7 +35,7 @@ export class DenoWorkspace {
   getCliDependencyCrates() {
     return this.getCliCrate()
       .descendantDependenciesInRepo()
-      .filter((c) => c.name !== "test_util");
+      .filter((c) => c.name !== "test_server");
   }
 
   getCliCrate() {