From 6be389ce291317346b2085231813cccd0e501daf Mon Sep 17 00:00:00 2001 From: Asher Gomez Date: Wed, 14 Feb 2024 03:22:49 +1100 Subject: [PATCH] chore: move `test_util/std` to `tests/util/std` (#22402) Note: tests are not the only part of the codebase that uses `std`. Other parts, like `tools/`, do too. So, it could be argued that this is a little misleading. Either way, I'm doing this as discussed with @mmastrac. --- .dprint.json | 2 +- .github/workflows/ci.generate.ts | 2 +- .github/workflows/ci.yml | 4 ++-- .gitmodules | 4 ++-- Cargo.toml | 2 +- cli/bench/main.rs | 10 +++++----- ext/websocket/autobahn/autobahn_server.js | 2 +- test_util/src/lib.rs | 2 +- tests/config/deno.json | 2 +- tests/node_compat/deno.json | 2 +- tests/testdata/bench/allow_all.ts | 2 +- tests/testdata/bench/allow_none.ts | 2 +- tests/testdata/cat.ts | 2 +- tests/testdata/cert/listen_tls_alpn_fail.ts | 2 +- .../compile/dynamic_imports/main_unanalyzable.ts | 2 +- .../compile/standalone_follow_redirects_2.js | 2 +- .../no_snaps_included/no_snaps_included_test.ts | 2 +- .../testdata/coverage/no_tests_included/foo.test.js | 2 +- .../testdata/coverage/no_tests_included/foo.test.mts | 2 +- .../testdata/coverage/no_tests_included/foo.test.ts | 2 +- tests/testdata/coverage/no_transpiled_lines/index.ts | 2 +- tests/testdata/echo_server.ts | 2 +- tests/testdata/run/045_proxy_test.ts | 4 ++-- tests/testdata/run/import_meta/main.ts | 2 +- tests/testdata/run/onload/imported.ts | 2 +- tests/testdata/run/onload/main.ts | 2 +- tests/testdata/run/onload/nest_imported.ts | 2 +- tests/testdata/run/textproto.ts | 4 ++-- tests/testdata/run/tls_connecttls.js | 4 ++-- tests/testdata/run/tls_starttls.js | 6 +++--- tests/testdata/run/websocket_server_idletimeout.ts | 2 +- tests/testdata/test/allow_all.ts | 2 +- tests/testdata/test/allow_none.ts | 2 +- tests/testdata/test/ops_sanitizer_missing_details.ts | 2 +- tests/testdata/workers/deno_worker.ts | 2 +- {test_util => tests/util}/std | 0 tools/node_compat/deno.json | 2 +- tools/util.js | 8 ++++---- tools/wpt.ts | 12 +++++++++--- tools/wpt/utils.ts | 2 +- 40 files changed, 61 insertions(+), 55 deletions(-) rename {test_util => tests/util}/std (100%) diff --git a/.dprint.json b/.dprint.json index ab12459e4f..df361e0089 100644 --- a/.dprint.json +++ b/.dprint.json @@ -46,7 +46,7 @@ "gh-pages", "target", "tests/ffi/tests/test.js", - "test_util/std", + "tests/util/std", "test_util/wpt", "third_party", "tools/node_compat/TODO.md", diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index 29077ab546..456c6e9ff7 100755 --- a/.github/workflows/ci.generate.ts +++ b/.github/workflows/ci.generate.ts @@ -445,7 +445,7 @@ const ci = { }, steps: skipJobsIfPrAndMarkedSkip([ ...cloneRepoStep, - submoduleStep("./test_util/std"), + submoduleStep("./tests/util/std"), { ...submoduleStep("./test_util/wpt"), if: "matrix.wpt", diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7342319c4c..dfb5a5a977 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -149,8 +149,8 @@ jobs: fetch-depth: 5 submodules: false if: '!(matrix.skip)' - - name: Clone submodule ./test_util/std - run: git submodule update --init --recursive --depth=1 -- ./test_util/std + - name: Clone submodule ./tests/util/std + run: git submodule update --init --recursive --depth=1 -- ./tests/util/std if: '!(matrix.skip)' - name: Clone submodule ./test_util/wpt run: git submodule update --init --recursive --depth=1 -- ./test_util/wpt diff --git a/.gitmodules b/.gitmodules index c35696a052..3cfaa82702 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,5 @@ -[submodule "test_util/std"] - path = test_util/std +[submodule "tests/util/std"] + path = tests/util/std url = https://github.com/denoland/deno_std shallow = true [submodule "test_util/wpt"] diff --git a/Cargo.toml b/Cargo.toml index c76dd166cc..d069d1652a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ members = [ "tests/ffi", "tests/napi", ] -exclude = ["test_util/std/hash/_wasm"] +exclude = ["tests/util/std/hash/_wasm"] [workspace.package] authors = ["the Deno authors"] diff --git a/cli/bench/main.rs b/cli/bench/main.rs index 4f59464142..d58a6fdb64 100644 --- a/cli/bench/main.rs +++ b/cli/bench/main.rs @@ -123,7 +123,7 @@ const EXEC_TIME_BENCHMARKS: &[(&str, &[&str], Option)] = &[ "check", "--reload", "--unstable", - "test_util/std/http/file_server_test.ts", + "tests/util/std/http/file_server_test.ts", ], None, ), @@ -134,7 +134,7 @@ const EXEC_TIME_BENCHMARKS: &[(&str, &[&str], Option)] = &[ "--reload", "--no-check", "--unstable", - "test_util/std/http/file_server_test.ts", + "tests/util/std/http/file_server_test.ts", ], None, ), @@ -143,7 +143,7 @@ const EXEC_TIME_BENCHMARKS: &[(&str, &[&str], Option)] = &[ &[ "bundle", "--unstable", - "test_util/std/http/file_server_test.ts", + "tests/util/std/http/file_server_test.ts", ], None, ), @@ -153,7 +153,7 @@ const EXEC_TIME_BENCHMARKS: &[(&str, &[&str], Option)] = &[ "bundle", "--no-check", "--unstable", - "test_util/std/http/file_server_test.ts", + "tests/util/std/http/file_server_test.ts", ], None, ), @@ -306,7 +306,7 @@ fn get_binary_sizes(target_dir: &Path) -> Result> { } const BUNDLES: &[(&str, &str)] = &[ - ("file_server", "./test_util/std/http/file_server.ts"), + ("file_server", "./tests/util/std/http/file_server.ts"), ("welcome", "./tests/testdata/welcome.ts"), ]; fn bundle_benchmark(deno_exe: &Path) -> Result> { diff --git a/ext/websocket/autobahn/autobahn_server.js b/ext/websocket/autobahn/autobahn_server.js index 6e9879ae84..18b58ab1ee 100644 --- a/ext/websocket/autobahn/autobahn_server.js +++ b/ext/websocket/autobahn/autobahn_server.js @@ -1,5 +1,5 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import { parse } from "../../../test_util/std/flags/mod.ts"; +import { parse } from "../../../tests/util/std/flags/mod.ts"; const { port } = parse(Deno.args, { number: ["port"], diff --git a/test_util/src/lib.rs b/test_util/src/lib.rs index f8fbb8b65e..539f4456d8 100644 --- a/test_util/src/lib.rs +++ b/test_util/src/lib.rs @@ -118,7 +118,7 @@ pub fn jsr_registry_unset_url() -> String { } pub fn std_path() -> PathRef { - root_path().join("test_util").join("std") + root_path().join("tests").join("util").join("std") } pub fn std_file_url() -> String { diff --git a/tests/config/deno.json b/tests/config/deno.json index 52538a8123..8f629a65c6 100644 --- a/tests/config/deno.json +++ b/tests/config/deno.json @@ -1,6 +1,6 @@ { "imports": { "@test_util/": "../../test_util/", - "@std/": "../../test_util/std/" + "@std/": "../util/std/" } } diff --git a/tests/node_compat/deno.json b/tests/node_compat/deno.json index 52538a8123..8f629a65c6 100644 --- a/tests/node_compat/deno.json +++ b/tests/node_compat/deno.json @@ -1,6 +1,6 @@ { "imports": { "@test_util/": "../../test_util/", - "@std/": "../../test_util/std/" + "@std/": "../util/std/" } } diff --git a/tests/testdata/bench/allow_all.ts b/tests/testdata/bench/allow_all.ts index 43e005b58d..b31aaf397f 100644 --- a/tests/testdata/bench/allow_all.ts +++ b/tests/testdata/bench/allow_all.ts @@ -1,4 +1,4 @@ -import { assertEquals } from "../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../../tests/util/std/assert/mod.ts"; const permissions: Deno.PermissionName[] = [ "read", diff --git a/tests/testdata/bench/allow_none.ts b/tests/testdata/bench/allow_none.ts index 62eb9c4c60..0cf3c27ef8 100644 --- a/tests/testdata/bench/allow_none.ts +++ b/tests/testdata/bench/allow_none.ts @@ -1,4 +1,4 @@ -import { unreachable } from "../../../test_util/std/assert/mod.ts"; +import { unreachable } from "../../../tests/util/std/assert/mod.ts"; const permissions: Deno.PermissionName[] = [ "read", diff --git a/tests/testdata/cat.ts b/tests/testdata/cat.ts index f0205451e6..39745da89f 100644 --- a/tests/testdata/cat.ts +++ b/tests/testdata/cat.ts @@ -1,4 +1,4 @@ -import { copy } from "../../test_util/std/streams/copy.ts"; +import { copy } from "../../tests/util/std/streams/copy.ts"; async function main() { for (let i = 1; i < Deno.args.length; i++) { const filename = Deno.args[i]; diff --git a/tests/testdata/cert/listen_tls_alpn_fail.ts b/tests/testdata/cert/listen_tls_alpn_fail.ts index f52316cbce..78fa395002 100644 --- a/tests/testdata/cert/listen_tls_alpn_fail.ts +++ b/tests/testdata/cert/listen_tls_alpn_fail.ts @@ -1,4 +1,4 @@ -import { assertRejects } from "../../../test_util/std/assert/mod.ts"; +import { assertRejects } from "../../../tests/util/std/assert/mod.ts"; const listener = Deno.listenTls({ port: Number(Deno.args[0]), diff --git a/tests/testdata/compile/dynamic_imports/main_unanalyzable.ts b/tests/testdata/compile/dynamic_imports/main_unanalyzable.ts index 7880fa4a6b..d87d917c2d 100644 --- a/tests/testdata/compile/dynamic_imports/main_unanalyzable.ts +++ b/tests/testdata/compile/dynamic_imports/main_unanalyzable.ts @@ -1,4 +1,4 @@ -import { join } from "../../../../test_util/std/path/mod.ts"; +import { join } from "../../../../tests/util/std/path/mod.ts"; console.log("Starting the main module"); diff --git a/tests/testdata/compile/standalone_follow_redirects_2.js b/tests/testdata/compile/standalone_follow_redirects_2.js index 765dda153c..1d00679f32 100644 --- a/tests/testdata/compile/standalone_follow_redirects_2.js +++ b/tests/testdata/compile/standalone_follow_redirects_2.js @@ -2,4 +2,4 @@ import { assertNotEquals as _a, assertStrictEquals as _b, -} from "../../../test_util/std/assert/mod.ts"; +} from "../../../tests/util/std/assert/mod.ts"; diff --git a/tests/testdata/coverage/no_snaps_included/no_snaps_included_test.ts b/tests/testdata/coverage/no_snaps_included/no_snaps_included_test.ts index 6fb44fcc68..c9cc648eae 100644 --- a/tests/testdata/coverage/no_snaps_included/no_snaps_included_test.ts +++ b/tests/testdata/coverage/no_snaps_included/no_snaps_included_test.ts @@ -1,4 +1,4 @@ -import { assertSnapshot } from "../../../../test_util/std/testing/snapshot.ts"; +import { assertSnapshot } from "../../../../tests/util/std/testing/snapshot.ts"; import { truth } from "./no_snaps_included.ts"; Deno.test("the truth", () => { diff --git a/tests/testdata/coverage/no_tests_included/foo.test.js b/tests/testdata/coverage/no_tests_included/foo.test.js index 46dd037bef..4c835026ae 100644 --- a/tests/testdata/coverage/no_tests_included/foo.test.js +++ b/tests/testdata/coverage/no_tests_included/foo.test.js @@ -1,5 +1,5 @@ import { addNumbers } from "./foo.ts"; -import { assertEquals } from "../../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../../../tests/util/std/assert/mod.ts"; Deno.test("addNumbers works", () => { assertEquals(addNumbers(1, 2), 3); diff --git a/tests/testdata/coverage/no_tests_included/foo.test.mts b/tests/testdata/coverage/no_tests_included/foo.test.mts index 46dd037bef..4c835026ae 100644 --- a/tests/testdata/coverage/no_tests_included/foo.test.mts +++ b/tests/testdata/coverage/no_tests_included/foo.test.mts @@ -1,5 +1,5 @@ import { addNumbers } from "./foo.ts"; -import { assertEquals } from "../../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../../../tests/util/std/assert/mod.ts"; Deno.test("addNumbers works", () => { assertEquals(addNumbers(1, 2), 3); diff --git a/tests/testdata/coverage/no_tests_included/foo.test.ts b/tests/testdata/coverage/no_tests_included/foo.test.ts index 46dd037bef..4c835026ae 100644 --- a/tests/testdata/coverage/no_tests_included/foo.test.ts +++ b/tests/testdata/coverage/no_tests_included/foo.test.ts @@ -1,5 +1,5 @@ import { addNumbers } from "./foo.ts"; -import { assertEquals } from "../../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../../../tests/util/std/assert/mod.ts"; Deno.test("addNumbers works", () => { assertEquals(addNumbers(1, 2), 3); diff --git a/tests/testdata/coverage/no_transpiled_lines/index.ts b/tests/testdata/coverage/no_transpiled_lines/index.ts index 8b87e76805..27b2dd758c 100644 --- a/tests/testdata/coverage/no_transpiled_lines/index.ts +++ b/tests/testdata/coverage/no_transpiled_lines/index.ts @@ -1,3 +1,3 @@ -export { assertStrictEquals } from "../../../../test_util/std/assert/mod.ts"; +export { assertStrictEquals } from "../../../../tests/util/std/assert/mod.ts"; export * from "./interface.ts"; diff --git a/tests/testdata/echo_server.ts b/tests/testdata/echo_server.ts index e7622c7aae..cbf081c355 100644 --- a/tests/testdata/echo_server.ts +++ b/tests/testdata/echo_server.ts @@ -1,4 +1,4 @@ -import { copy } from "../../test_util/std/streams/copy.ts"; +import { copy } from "../../tests/util/std/streams/copy.ts"; const addr = Deno.args[0] || "0.0.0.0:4544"; const [hostname, port] = addr.split(":"); const listener = Deno.listen({ hostname, port: Number(port) }); diff --git a/tests/testdata/run/045_proxy_test.ts b/tests/testdata/run/045_proxy_test.ts index 1929ed6bce..fcb898c779 100644 --- a/tests/testdata/run/045_proxy_test.ts +++ b/tests/testdata/run/045_proxy_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import { Server } from "../../../test_util/std/http/server.ts"; -import { assertEquals } from "../../../test_util/std/assert/mod.ts"; +import { Server } from "../../../tests/util/std/http/server.ts"; +import { assertEquals } from "../../../tests/util/std/assert/mod.ts"; const addr = Deno.args[1] || "localhost:4555"; diff --git a/tests/testdata/run/import_meta/main.ts b/tests/testdata/run/import_meta/main.ts index 61880e2c1a..384a9232e1 100644 --- a/tests/testdata/run/import_meta/main.ts +++ b/tests/testdata/run/import_meta/main.ts @@ -1,4 +1,4 @@ -import { assertThrows } from "../../../../test_util/std/assert/mod.ts"; +import { assertThrows } from "../../../../tests/util/std/assert/mod.ts"; import "http://localhost:4545/run/import_meta/other.ts"; import "./other.ts"; diff --git a/tests/testdata/run/onload/imported.ts b/tests/testdata/run/onload/imported.ts index d2a93c8d2b..5c412bd430 100644 --- a/tests/testdata/run/onload/imported.ts +++ b/tests/testdata/run/onload/imported.ts @@ -1,5 +1,5 @@ // deno-lint-ignore-file no-window-prefix -import { assert } from "../../../../test_util/std/assert/mod.ts"; +import { assert } from "../../../../tests/util/std/assert/mod.ts"; import "./nest_imported.ts"; const handler = (e: Event) => { diff --git a/tests/testdata/run/onload/main.ts b/tests/testdata/run/onload/main.ts index 990a21131d..e3eae99fa8 100644 --- a/tests/testdata/run/onload/main.ts +++ b/tests/testdata/run/onload/main.ts @@ -1,5 +1,5 @@ // deno-lint-ignore-file no-window-prefix no-prototype-builtins -import { assert } from "../../../../test_util/std/assert/mod.ts"; +import { assert } from "../../../../tests/util/std/assert/mod.ts"; import "./imported.ts"; assert(window.hasOwnProperty("onload")); diff --git a/tests/testdata/run/onload/nest_imported.ts b/tests/testdata/run/onload/nest_imported.ts index 2151f41856..61af36e0a8 100644 --- a/tests/testdata/run/onload/nest_imported.ts +++ b/tests/testdata/run/onload/nest_imported.ts @@ -1,5 +1,5 @@ // deno-lint-ignore-file no-window-prefix -import { assert } from "../../../../test_util/std/assert/mod.ts"; +import { assert } from "../../../../tests/util/std/assert/mod.ts"; const handler = (e: Event) => { assert(e.type === "beforeunload" ? e.cancelable : !e.cancelable); diff --git a/tests/testdata/run/textproto.ts b/tests/testdata/run/textproto.ts index cf9a4dce97..7297fc4462 100644 --- a/tests/testdata/run/textproto.ts +++ b/tests/testdata/run/textproto.ts @@ -17,8 +17,8 @@ import type { BufReader, ReadLineResult, -} from "../../../test_util/std/io/buf_reader.ts"; -import { concat } from "../../../test_util/std/bytes/concat.ts"; +} from "../../../tests/util/std/io/buf_reader.ts"; +import { concat } from "../../../tests/util/std/bytes/concat.ts"; // Constants created for DRY const CHAR_SPACE: number = " ".charCodeAt(0); diff --git a/tests/testdata/run/tls_connecttls.js b/tests/testdata/run/tls_connecttls.js index f085d7a8fd..b3cc3f3393 100644 --- a/tests/testdata/run/tls_connecttls.js +++ b/tests/testdata/run/tls_connecttls.js @@ -1,5 +1,5 @@ -import { assert, assertEquals } from "../../../test_util/std/assert/mod.ts"; -import { BufReader, BufWriter } from "../../../test_util/std/io/mod.ts"; +import { assert, assertEquals } from "../../../tests/util/std/assert/mod.ts"; +import { BufReader, BufWriter } from "../../../tests/util/std/io/mod.ts"; import { TextProtoReader } from "./textproto.ts"; const encoder = new TextEncoder(); diff --git a/tests/testdata/run/tls_starttls.js b/tests/testdata/run/tls_starttls.js index 5f5428ecd7..ebe0d07254 100644 --- a/tests/testdata/run/tls_starttls.js +++ b/tests/testdata/run/tls_starttls.js @@ -1,6 +1,6 @@ -import { assert, assertEquals } from "../../../test_util/std/assert/mod.ts"; -import { BufReader } from "../../../test_util/std/io/buf_reader.ts"; -import { BufWriter } from "../../../test_util/std/io/buf_writer.ts"; +import { assert, assertEquals } from "../../../tests/util/std/assert/mod.ts"; +import { BufReader } from "../../../tests/util/std/io/buf_reader.ts"; +import { BufWriter } from "../../../tests/util/std/io/buf_writer.ts"; import { TextProtoReader } from "./textproto.ts"; const encoder = new TextEncoder(); diff --git a/tests/testdata/run/websocket_server_idletimeout.ts b/tests/testdata/run/websocket_server_idletimeout.ts index f116c4556a..85b031b8e5 100644 --- a/tests/testdata/run/websocket_server_idletimeout.ts +++ b/tests/testdata/run/websocket_server_idletimeout.ts @@ -1,4 +1,4 @@ -import { assertEquals } from "../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../../tests/util/std/assert/mod.ts"; const errorDeferred = Promise.withResolvers(); const closeDeferred = Promise.withResolvers(); diff --git a/tests/testdata/test/allow_all.ts b/tests/testdata/test/allow_all.ts index e533bc017d..44d61d99b2 100644 --- a/tests/testdata/test/allow_all.ts +++ b/tests/testdata/test/allow_all.ts @@ -1,4 +1,4 @@ -import { assertEquals } from "../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../../tests/util/std/assert/mod.ts"; const permissions: Deno.PermissionName[] = [ "read", diff --git a/tests/testdata/test/allow_none.ts b/tests/testdata/test/allow_none.ts index 04c40a0939..359f317007 100644 --- a/tests/testdata/test/allow_none.ts +++ b/tests/testdata/test/allow_none.ts @@ -1,4 +1,4 @@ -import { unreachable } from "../../../test_util/std/assert/mod.ts"; +import { unreachable } from "../../../tests/util/std/assert/mod.ts"; const permissions: Deno.PermissionName[] = [ "read", diff --git a/tests/testdata/test/ops_sanitizer_missing_details.ts b/tests/testdata/test/ops_sanitizer_missing_details.ts index a40240bfc8..45fc89b42f 100644 --- a/tests/testdata/test/ops_sanitizer_missing_details.ts +++ b/tests/testdata/test/ops_sanitizer_missing_details.ts @@ -1,6 +1,6 @@ // https://github.com/denoland/deno/issues/13729 // https://github.com/denoland/deno/issues/13938 -import { writeAll } from "../../../test_util/std/streams/write_all.ts"; +import { writeAll } from "../../../tests/util/std/streams/write_all.ts"; Deno.test("test 1", { permissions: { write: true, read: true } }, async () => { const tmpFile = await Deno.makeTempFile(); diff --git a/tests/testdata/workers/deno_worker.ts b/tests/testdata/workers/deno_worker.ts index cbebde94ac..9928b378b4 100644 --- a/tests/testdata/workers/deno_worker.ts +++ b/tests/testdata/workers/deno_worker.ts @@ -1,4 +1,4 @@ -import { assert } from "../../../test_util/std/assert/mod.ts"; +import { assert } from "../../../tests/util/std/assert/mod.ts"; onmessage = function (e) { if (typeof self.Deno === "undefined") { diff --git a/test_util/std b/tests/util/std similarity index 100% rename from test_util/std rename to tests/util/std diff --git a/tools/node_compat/deno.json b/tools/node_compat/deno.json index 98655695f2..f2c33c3d54 100644 --- a/tools/node_compat/deno.json +++ b/tools/node_compat/deno.json @@ -1,7 +1,7 @@ { "imports": { "@test_util/": "../../test_util/", - "@std/": "../../test_util/std/" + "@std/": "../../tests/util/std/" }, "tasks": { "setup": "deno run --allow-read --allow-write ./setup.ts", diff --git a/tools/util.js b/tools/util.js index 92d8da9676..f9cc2d911e 100644 --- a/tools/util.js +++ b/tools/util.js @@ -5,12 +5,12 @@ import { join, resolve, toFileUrl, -} from "../test_util/std/path/mod.ts"; +} from "../tests/util/std/path/mod.ts"; import { wait } from "https://deno.land/x/wait@0.1.13/mod.ts"; export { dirname, fromFileUrl, join, resolve, toFileUrl }; -export { existsSync, walk } from "../test_util/std/fs/mod.ts"; -export { TextLineStream } from "../test_util/std/streams/text_line_stream.ts"; -export { delay } from "../test_util/std/async/delay.ts"; +export { existsSync, walk } from "../tests/util/std/fs/mod.ts"; +export { TextLineStream } from "../tests/util/std/streams/text_line_stream.ts"; +export { delay } from "../tests/util/std/async/delay.ts"; // [toolName] --version output const versions = { diff --git a/tools/wpt.ts b/tools/wpt.ts index 62fc7b539e..3dab83fb13 100755 --- a/tools/wpt.ts +++ b/tools/wpt.ts @@ -32,9 +32,15 @@ import { updateManifest, wptreport, } from "./wpt/utils.ts"; -import { pooledMap } from "../test_util/std/async/pool.ts"; -import { blue, bold, green, red, yellow } from "../test_util/std/fmt/colors.ts"; -import { writeAll, writeAllSync } from "../test_util/std/streams/write_all.ts"; +import { pooledMap } from "../tests/util/std/async/pool.ts"; +import { + blue, + bold, + green, + red, + yellow, +} from "../tests/util/std/fmt/colors.ts"; +import { writeAll, writeAllSync } from "../tests/util/std/streams/write_all.ts"; import { saveExpectation } from "./wpt/utils.ts"; class TestFilter { diff --git a/tools/wpt/utils.ts b/tools/wpt/utils.ts index 48a50a0e24..aa1d6d1151 100644 --- a/tools/wpt/utils.ts +++ b/tools/wpt/utils.ts @@ -1,7 +1,7 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. /// FLAGS -import { parse } from "../../test_util/std/flags/mod.ts"; +import { parse } from "../../tests/util/std/flags/mod.ts"; import { join, resolve, ROOT_PATH } from "../util.js"; export const {