From 42cf762cf4a5d3bf6e4c53c48464c0aec1b9e6b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Sat, 31 Aug 2024 22:38:21 +0100 Subject: [PATCH] chore: cleanup code for unstable tests (#25330) Towards https://github.com/denoland/deno/issues/25241 Removes code for tests of unstable APIs that were stabilized with Deno 2.0.0-rc.0. --- tests/integration/run_tests.rs | 48 ------------------- tests/testdata/run/unstable.js | 1 - tests/testdata/run/unstable.ts | 1 - tests/testdata/run/unstable_disabled_js.out | 1 - tests/testdata/run/unstable_enabled.out | 1 - tests/testdata/run/unstable_enabled_js.out | 1 - tests/testdata/run/unstable_ffi.disabled.out | 10 ---- tests/testdata/run/unstable_ffi.enabled.out | 10 ---- tests/testdata/run/unstable_ffi.js | 14 ------ tests/testdata/run/unstable_fs.disabled.out | 10 ---- tests/testdata/run/unstable_fs.enabled.out | 10 ---- tests/testdata/run/unstable_fs.js | 14 ------ .../testdata/run/unstable_webgpu.disabled.out | 2 - .../testdata/run/unstable_webgpu.enabled.out | 2 - tests/testdata/run/unstable_webgpu.js | 10 ---- tools/lint.js | 2 +- 16 files changed, 1 insertion(+), 136 deletions(-) delete mode 100644 tests/testdata/run/unstable.js delete mode 100644 tests/testdata/run/unstable.ts delete mode 100644 tests/testdata/run/unstable_disabled_js.out delete mode 100644 tests/testdata/run/unstable_enabled.out delete mode 100644 tests/testdata/run/unstable_enabled_js.out delete mode 100644 tests/testdata/run/unstable_ffi.disabled.out delete mode 100644 tests/testdata/run/unstable_ffi.enabled.out delete mode 100644 tests/testdata/run/unstable_ffi.js delete mode 100644 tests/testdata/run/unstable_fs.disabled.out delete mode 100644 tests/testdata/run/unstable_fs.enabled.out delete mode 100644 tests/testdata/run/unstable_fs.js delete mode 100644 tests/testdata/run/unstable_webgpu.disabled.out delete mode 100644 tests/testdata/run/unstable_webgpu.enabled.out delete mode 100644 tests/testdata/run/unstable_webgpu.js diff --git a/tests/integration/run_tests.rs b/tests/integration/run_tests.rs index e85033ffaad767..efa2e6c850055e 100644 --- a/tests/integration/run_tests.rs +++ b/tests/integration/run_tests.rs @@ -1803,17 +1803,6 @@ itest!(top_level_for_await_ts { output: "run/top_level_await/top_level_for_await.out", }); -// TODO(2.0): remove, `Deno.umask` is enabled by default with Deno 2. -// itest!(unstable_disabled_js { -// args: "run --reload run/unstable.js", -// output: "run/unstable_disabled_js.out", -// }); - -itest!(unstable_enabled_js { - args: "run --quiet --reload --unstable-fs run/unstable.ts", - output: "run/unstable_enabled_js.out", -}); - itest!(unstable_worker { args: "run --reload --quiet --allow-read run/unstable_worker.ts", output: "run/unstable_worker.ts.out", @@ -1851,30 +1840,6 @@ itest!(unstable_cron_enabled { output: "run/unstable_cron.enabled.out", }); -// TODO(2.0): remove, FFI is stable by default with Deno 2. -// itest!(unstable_ffi_disabled { -// args: "run --quiet --reload --allow-read run/unstable_ffi.js", -// output: "run/unstable_ffi.disabled.out", -// }); - -// TODO(2.0): remove, FFI is stable by default with Deno 2. -// itest!(unstable_ffi_enabled { -// args: "run --quiet --reload --allow-read --unstable-ffi run/unstable_ffi.js", -// output: "run/unstable_ffi.enabled.out", -// }); - -// TODO(2.0): remove, FS APIs are stable by default with Deno 2. -// itest!(unstable_fs_disabled { -// args: "run --quiet --reload --allow-read run/unstable_fs.js", -// output: "run/unstable_fs.disabled.out", -// }); - -// TODO(2.0): remove, FS APIs are stable by default with Deno 2. -// itest!(unstable_fs_enabled { -// args: "run --quiet --reload --allow-read --unstable-fs run/unstable_fs.js", -// output: "run/unstable_fs.enabled.out", -// }); - itest!(unstable_http_disabled { args: "run --quiet --reload --allow-read run/unstable_http.js", output: "run/unstable_http.disabled.out", @@ -1906,19 +1871,6 @@ itest!(unstable_kv_enabled { output: "run/unstable_kv.enabled.out", }); -// TODO(2.0): remove, WebGPU is enabled by default with Deno 2. -// itest!(unstable_webgpu_disabled { -// args: "run --quiet --reload --allow-read run/unstable_webgpu.js", -// output: "run/unstable_webgpu.disabled.out", -// }); - -// TODO(2.0): remove, WebGPU is enabled by default with Deno 2. -// itest!(unstable_webgpu_enabled { -// args: -// "run --quiet --reload --allow-read --unstable-webgpu run/unstable_webgpu.js", -// output: "run/unstable_webgpu.enabled.out", -// }); - itest!(import_compression { args: "run --quiet --reload --allow-net run/import_compression/main.ts", output: "run/import_compression/main.out", diff --git a/tests/testdata/run/unstable.js b/tests/testdata/run/unstable.js deleted file mode 100644 index 8c01b214e3049e..00000000000000 --- a/tests/testdata/run/unstable.js +++ /dev/null @@ -1 +0,0 @@ -console.log(Deno.umask); diff --git a/tests/testdata/run/unstable.ts b/tests/testdata/run/unstable.ts deleted file mode 100644 index 8c01b214e3049e..00000000000000 --- a/tests/testdata/run/unstable.ts +++ /dev/null @@ -1 +0,0 @@ -console.log(Deno.umask); diff --git a/tests/testdata/run/unstable_disabled_js.out b/tests/testdata/run/unstable_disabled_js.out deleted file mode 100644 index 417b7b5370df81..00000000000000 --- a/tests/testdata/run/unstable_disabled_js.out +++ /dev/null @@ -1 +0,0 @@ -undefined diff --git a/tests/testdata/run/unstable_enabled.out b/tests/testdata/run/unstable_enabled.out deleted file mode 100644 index 5f88c778cdf7df..00000000000000 --- a/tests/testdata/run/unstable_enabled.out +++ /dev/null @@ -1 +0,0 @@ -[Function: umask] diff --git a/tests/testdata/run/unstable_enabled_js.out b/tests/testdata/run/unstable_enabled_js.out deleted file mode 100644 index 5f88c778cdf7df..00000000000000 --- a/tests/testdata/run/unstable_enabled_js.out +++ /dev/null @@ -1 +0,0 @@ -[Function: umask] diff --git a/tests/testdata/run/unstable_ffi.disabled.out b/tests/testdata/run/unstable_ffi.disabled.out deleted file mode 100644 index 0d8ac4410fb5f3..00000000000000 --- a/tests/testdata/run/unstable_ffi.disabled.out +++ /dev/null @@ -1,10 +0,0 @@ -main undefined -main undefined -main undefined -main undefined -main undefined -worker undefined -worker undefined -worker undefined -worker undefined -worker undefined diff --git a/tests/testdata/run/unstable_ffi.enabled.out b/tests/testdata/run/unstable_ffi.enabled.out deleted file mode 100644 index 672b2a2a23248f..00000000000000 --- a/tests/testdata/run/unstable_ffi.enabled.out +++ /dev/null @@ -1,10 +0,0 @@ -main [class UnsafeCallback] -main [class UnsafeFnPointer] -main [class UnsafePointer] -main [class UnsafePointerView] -main [Function: dlopen] -worker [class UnsafeCallback] -worker [class UnsafeFnPointer] -worker [class UnsafePointer] -worker [class UnsafePointerView] -worker [Function: dlopen] diff --git a/tests/testdata/run/unstable_ffi.js b/tests/testdata/run/unstable_ffi.js deleted file mode 100644 index 4809c5ffe49d64..00000000000000 --- a/tests/testdata/run/unstable_ffi.js +++ /dev/null @@ -1,14 +0,0 @@ -const scope = import.meta.url.slice(-7) === "#worker" ? "worker" : "main"; - -console.log(scope, Deno.UnsafeCallback); -console.log(scope, Deno.UnsafeFnPointer); -console.log(scope, Deno.UnsafePointer); -console.log(scope, Deno.UnsafePointerView); -console.log(scope, Deno.dlopen); - -if (scope === "worker") { - postMessage("done"); -} else { - const worker = new Worker(`${import.meta.url}#worker`, { type: "module" }); - worker.onmessage = () => Deno.exit(0); -} diff --git a/tests/testdata/run/unstable_fs.disabled.out b/tests/testdata/run/unstable_fs.disabled.out deleted file mode 100644 index 0d8ac4410fb5f3..00000000000000 --- a/tests/testdata/run/unstable_fs.disabled.out +++ /dev/null @@ -1,10 +0,0 @@ -main undefined -main undefined -main undefined -main undefined -main undefined -worker undefined -worker undefined -worker undefined -worker undefined -worker undefined diff --git a/tests/testdata/run/unstable_fs.enabled.out b/tests/testdata/run/unstable_fs.enabled.out deleted file mode 100644 index 6938fa9c227d93..00000000000000 --- a/tests/testdata/run/unstable_fs.enabled.out +++ /dev/null @@ -1,10 +0,0 @@ -main [AsyncFunction: flock] -main [Function: flockSync] -main [AsyncFunction: funlock] -main [Function: funlockSync] -main [Function: umask] -worker [AsyncFunction: flock] -worker [Function: flockSync] -worker [AsyncFunction: funlock] -worker [Function: funlockSync] -worker [Function: umask] diff --git a/tests/testdata/run/unstable_fs.js b/tests/testdata/run/unstable_fs.js deleted file mode 100644 index 83f14f2fd7b820..00000000000000 --- a/tests/testdata/run/unstable_fs.js +++ /dev/null @@ -1,14 +0,0 @@ -const scope = import.meta.url.slice(-7) === "#worker" ? "worker" : "main"; - -console.log(scope, Deno.flock); -console.log(scope, Deno.flockSync); -console.log(scope, Deno.funlock); -console.log(scope, Deno.funlockSync); -console.log(scope, Deno.umask); - -if (scope === "worker") { - postMessage("done"); -} else { - const worker = new Worker(`${import.meta.url}#worker`, { type: "module" }); - worker.onmessage = () => Deno.exit(0); -} diff --git a/tests/testdata/run/unstable_webgpu.disabled.out b/tests/testdata/run/unstable_webgpu.disabled.out deleted file mode 100644 index 77586635272633..00000000000000 --- a/tests/testdata/run/unstable_webgpu.disabled.out +++ /dev/null @@ -1,2 +0,0 @@ -main undefined -worker undefined diff --git a/tests/testdata/run/unstable_webgpu.enabled.out b/tests/testdata/run/unstable_webgpu.enabled.out deleted file mode 100644 index e2cc915ba26e2f..00000000000000 --- a/tests/testdata/run/unstable_webgpu.enabled.out +++ /dev/null @@ -1,2 +0,0 @@ -main [class GPU] -worker [class GPU] diff --git a/tests/testdata/run/unstable_webgpu.js b/tests/testdata/run/unstable_webgpu.js deleted file mode 100644 index a796b1c4d7b4db..00000000000000 --- a/tests/testdata/run/unstable_webgpu.js +++ /dev/null @@ -1,10 +0,0 @@ -const scope = import.meta.url.slice(-7) === "#worker" ? "worker" : "main"; - -console.log(scope, globalThis.GPU); - -if (scope === "worker") { - postMessage("done"); -} else { - const worker = new Worker(`${import.meta.url}#worker`, { type: "module" }); - worker.onmessage = () => Deno.exit(0); -} diff --git a/tools/lint.js b/tools/lint.js index 9b3260b9e2abab..6ce04a657d1359 100755 --- a/tools/lint.js +++ b/tools/lint.js @@ -222,7 +222,7 @@ async function ensureNoNewITests() { "pm_tests.rs": 0, "publish_tests.rs": 0, "repl_tests.rs": 0, - "run_tests.rs": 360, + "run_tests.rs": 352, "shared_library_tests.rs": 0, "task_tests.rs": 30, "test_tests.rs": 77,