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>
denoland · Feb 19, 2024 · 2b279ad · 2b279ad
1 parent eb542bc
commit 2b279ad
Show file tree

Hide file tree

Showing 30 changed files with 20 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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 → tests/util/server/Cargo.toml b/test_util/Cargo.toml → 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 → tests/util/server/src/assertions.rs b/test_util/src/assertions.rs → tests/util/server/src/assertions.rs
diff --git a/test_util/src/builders.rs → tests/util/server/src/builders.rs b/test_util/src/builders.rs → tests/util/server/src/builders.rs
diff --git a/test_util/src/factory.rs → tests/util/server/src/factory.rs b/test_util/src/factory.rs → tests/util/server/src/factory.rs
diff --git a/test_util/src/fs.rs → tests/util/server/src/fs.rs b/test_util/src/fs.rs → tests/util/server/src/fs.rs
diff --git a/test_util/src/https.rs → tests/util/server/src/https.rs b/test_util/src/https.rs → tests/util/server/src/https.rs
diff --git a/test_util/src/lib.rs → tests/util/server/src/lib.rs b/test_util/src/lib.rs → tests/util/server/src/lib.rs
@@ -67,6 +67,10 @@ pub fn env_vars_for_jsr_tests() -> Vec<(String, String)> {
 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 → tests/util/server/src/lsp.rs b/test_util/src/lsp.rs → tests/util/server/src/lsp.rs
diff --git a/test_util/src/macros.rs → tests/util/server/src/macros.rs b/test_util/src/macros.rs → tests/util/server/src/macros.rs
diff --git a/test_util/src/npm.rs → tests/util/server/src/npm.rs b/test_util/src/npm.rs → tests/util/server/src/npm.rs
diff --git a/test_util/src/pty.rs → tests/util/server/src/pty.rs b/test_util/src/pty.rs → tests/util/server/src/pty.rs
diff --git a/test_util/src/servers/grpc.rs → tests/util/server/src/servers/grpc.rs b/test_util/src/servers/grpc.rs → tests/util/server/src/servers/grpc.rs
diff --git a/test_util/src/servers/hyper_utils.rs → tests/util/server/src/servers/hyper_utils.rs b/test_util/src/servers/hyper_utils.rs → tests/util/server/src/servers/hyper_utils.rs
diff --git a/test_util/src/servers/mod.rs → tests/util/server/src/servers/mod.rs b/test_util/src/servers/mod.rs → tests/util/server/src/servers/mod.rs
diff --git a/test_util/src/servers/registry.rs → tests/util/server/src/servers/registry.rs b/test_util/src/servers/registry.rs → tests/util/server/src/servers/registry.rs
diff --git a/test_util/src/servers/ws.rs → tests/util/server/src/servers/ws.rs b/test_util/src/servers/ws.rs → tests/util/server/src/servers/ws.rs
diff --git a/test_util/src/spawn.rs → tests/util/server/src/spawn.rs b/test_util/src/spawn.rs → tests/util/server/src/spawn.rs
diff --git a/test_util/src/test_server.rs → tests/util/server/src/test_server.rs b/test_util/src/test_server.rs → 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 → ...il/server/src/testdata/strace_summary.out b/test_util/src/testdata/strace_summary.out → ...il/server/src/testdata/strace_summary.out
diff --git a/test_util/src/testdata/strace_summary2.out → ...l/server/src/testdata/strace_summary2.out b/test_util/src/testdata/strace_summary2.out → ...l/server/src/testdata/strace_summary2.out
diff --git a/test_util/src/testdata/strace_summary3.out → ...l/server/src/testdata/strace_summary3.out b/test_util/src/testdata/strace_summary3.out → ...l/server/src/testdata/strace_summary3.out
diff --git a/test_util/src/testdata/time.out → tests/util/server/src/testdata/time.out b/test_util/src/testdata/time.out → tests/util/server/src/testdata/time.out
diff --git a/test_util/src/testdata/wrk1.txt → tests/util/server/src/testdata/wrk1.txt b/test_util/src/testdata/wrk1.txt → tests/util/server/src/testdata/wrk1.txt
diff --git a/test_util/src/testdata/wrk2.txt → tests/util/server/src/testdata/wrk2.txt b/test_util/src/testdata/wrk2.txt → tests/util/server/src/testdata/wrk2.txt
diff --git a/test_util/src/testdata/wrk3.txt → tests/util/server/src/testdata/wrk3.txt b/test_util/src/testdata/wrk3.txt → tests/util/server/src/testdata/wrk3.txt
diff --git 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() {