diff --git a/tests/integration/mod.rs b/tests/integration/mod.rs index 1b8e794699..d1d20aee18 100644 --- a/tests/integration/mod.rs +++ b/tests/integration/mod.rs @@ -68,5 +68,3 @@ mod test; mod upgrade; #[path = "watcher_tests.rs"] mod watcher; -#[path = "worker_tests.rs"] -mod worker; diff --git a/tests/integration/worker_tests.rs b/tests/integration/worker_tests.rs deleted file mode 100644 index d711b034c8..0000000000 --- a/tests/integration/worker_tests.rs +++ /dev/null @@ -1,119 +0,0 @@ -// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. - -use test_util::itest; - -itest!(worker_error { - args: "run -A workers/worker_error.ts", - output: "workers/worker_error.ts.out", - exit_code: 1, -}); - -itest!(worker_nested_error { - args: "run -A workers/worker_nested_error.ts", - output: "workers/worker_nested_error.ts.out", - exit_code: 1, -}); - -itest!(worker_async_error { - args: "run -A --quiet --reload workers/worker_async_error.ts", - output: "workers/worker_async_error.ts.out", - http_server: true, - exit_code: 1, -}); - -itest!(worker_message_handler_error { - args: "run -A --quiet --reload workers/worker_message_handler_error.ts", - output: "workers/worker_message_handler_error.ts.out", - http_server: true, - exit_code: 1, -}); - -itest!(nonexistent_worker { - args: "run --allow-read workers/nonexistent_worker.ts", - output: "workers/nonexistent_worker.out", - exit_code: 1, -}); - -itest!(_084_worker_custom_inspect { - args: "run --allow-read workers/custom_inspect/main.ts", - output: "workers/custom_inspect/main.out", -}); - -itest!(error_worker_permissions_local { - args: "run --reload workers/error_worker_permissions_local.ts", - output: "workers/error_worker_permissions_local.ts.out", - exit_code: 1, -}); - -itest!(error_worker_permissions_remote { - args: "run --reload workers/error_worker_permissions_remote.ts", - http_server: true, - output: "workers/error_worker_permissions_remote.ts.out", - exit_code: 1, -}); - -itest!(worker_permissions_remote_remote { - args: "run --quiet --reload --allow-net=localhost:4545 workers/permissions_remote_remote.ts", - output: "workers/permissions_remote_remote.ts.out", - http_server: true, - exit_code: 1, - }); - -itest!(worker_permissions_dynamic_remote { - args: "run --quiet --reload --allow-net --unstable-worker-options workers/permissions_dynamic_remote.ts", - output: "workers/permissions_dynamic_remote.ts.out", - http_server: true, - exit_code: 1, - }); - -itest!(worker_permissions_data_remote { - args: "run --quiet --reload --allow-net=localhost:4545 workers/permissions_data_remote.ts", - output: "workers/permissions_data_remote.ts.out", - http_server: true, - exit_code: 1, - }); - -itest!(worker_permissions_blob_remote { - args: "run --quiet --reload --allow-net=localhost:4545 workers/permissions_blob_remote.ts", - output: "workers/permissions_blob_remote.ts.out", - http_server: true, - exit_code: 1, - }); - -itest!(worker_permissions_data_local { - args: "run --quiet --reload --allow-net=localhost:4545 workers/permissions_data_local.ts", - output: "workers/permissions_data_local.ts.out", - http_server: true, - exit_code: 1, - }); - -itest!(worker_permissions_blob_local { - args: "run --quiet --reload --allow-net=localhost:4545 workers/permissions_blob_local.ts", - output: "workers/permissions_blob_local.ts.out", - http_server: true, - exit_code: 1, - }); - -itest!(worker_terminate_tla_crash { - args: "run --quiet --reload workers/terminate_tla_crash.js", - output: "workers/terminate_tla_crash.js.out", -}); - -itest!(worker_error_event { - args: "run --quiet -A workers/error_event.ts", - output: "workers/error_event.ts.out", - exit_code: 1, -}); - -// Regression test for https://github.com/denoland/deno/issues/19903 -itest!(worker_doest_stall_event_loop { - args: "run --quiet -A workers/worker_doest_stall_event_loop.ts", - output: "workers/worker_doest_stall_event_loop.ts.out", - exit_code: 0, -}); - -itest!(worker_ids_are_sequential { - args: "run --quiet -A workers/worker_ids_are_sequential.ts", - output: "workers/worker_ids_are_sequential.ts.out", - exit_code: 0, -}); diff --git a/tests/specs/worker/_084_worker_custom_inspect/__test__.jsonc b/tests/specs/worker/_084_worker_custom_inspect/__test__.jsonc new file mode 100644 index 0000000000..8d47afab45 --- /dev/null +++ b/tests/specs/worker/_084_worker_custom_inspect/__test__.jsonc @@ -0,0 +1,4 @@ +{ + "args": "run --allow-read custom_inspect/main.ts", + "output": "custom_inspect/main.out" +} diff --git a/tests/testdata/workers/custom_inspect/main.out b/tests/specs/worker/_084_worker_custom_inspect/custom_inspect/main.out similarity index 100% rename from tests/testdata/workers/custom_inspect/main.out rename to tests/specs/worker/_084_worker_custom_inspect/custom_inspect/main.out diff --git a/tests/testdata/workers/custom_inspect/main.ts b/tests/specs/worker/_084_worker_custom_inspect/custom_inspect/main.ts similarity index 100% rename from tests/testdata/workers/custom_inspect/main.ts rename to tests/specs/worker/_084_worker_custom_inspect/custom_inspect/main.ts diff --git a/tests/testdata/workers/custom_inspect/worker.ts b/tests/specs/worker/_084_worker_custom_inspect/custom_inspect/worker.ts similarity index 100% rename from tests/testdata/workers/custom_inspect/worker.ts rename to tests/specs/worker/_084_worker_custom_inspect/custom_inspect/worker.ts diff --git a/tests/specs/worker/error_worker_permissions_local/__test__.jsonc b/tests/specs/worker/error_worker_permissions_local/__test__.jsonc new file mode 100644 index 0000000000..a36e19fa64 --- /dev/null +++ b/tests/specs/worker/error_worker_permissions_local/__test__.jsonc @@ -0,0 +1,5 @@ +{ + "args": "run --reload error_worker_permissions_local.ts", + "output": "error_worker_permissions_local.ts.out", + "exitCode": 1 +} diff --git a/tests/testdata/workers/error_worker_permissions_local.ts b/tests/specs/worker/error_worker_permissions_local/error_worker_permissions_local.ts similarity index 100% rename from tests/testdata/workers/error_worker_permissions_local.ts rename to tests/specs/worker/error_worker_permissions_local/error_worker_permissions_local.ts diff --git a/tests/testdata/workers/error_worker_permissions_local.ts.out b/tests/specs/worker/error_worker_permissions_local/error_worker_permissions_local.ts.out similarity index 100% rename from tests/testdata/workers/error_worker_permissions_local.ts.out rename to tests/specs/worker/error_worker_permissions_local/error_worker_permissions_local.ts.out diff --git a/tests/testdata/workers/worker_types.ts b/tests/specs/worker/error_worker_permissions_local/worker_types.ts similarity index 100% rename from tests/testdata/workers/worker_types.ts rename to tests/specs/worker/error_worker_permissions_local/worker_types.ts diff --git a/tests/specs/worker/error_worker_permissions_remote/__test__.jsonc b/tests/specs/worker/error_worker_permissions_remote/__test__.jsonc new file mode 100644 index 0000000000..06a439fd47 --- /dev/null +++ b/tests/specs/worker/error_worker_permissions_remote/__test__.jsonc @@ -0,0 +1,5 @@ +{ + "args": "run --reload error_worker_permissions_remote.ts", + "output": "error_worker_permissions_remote.ts.out", + "exitCode": 1 +} diff --git a/tests/testdata/workers/error_worker_permissions_remote.ts b/tests/specs/worker/error_worker_permissions_remote/error_worker_permissions_remote.ts similarity index 100% rename from tests/testdata/workers/error_worker_permissions_remote.ts rename to tests/specs/worker/error_worker_permissions_remote/error_worker_permissions_remote.ts diff --git a/tests/testdata/workers/error_worker_permissions_remote.ts.out b/tests/specs/worker/error_worker_permissions_remote/error_worker_permissions_remote.ts.out similarity index 100% rename from tests/testdata/workers/error_worker_permissions_remote.ts.out rename to tests/specs/worker/error_worker_permissions_remote/error_worker_permissions_remote.ts.out diff --git a/tests/specs/worker/nonexistent_worker/__test__.jsonc b/tests/specs/worker/nonexistent_worker/__test__.jsonc new file mode 100644 index 0000000000..eada833525 --- /dev/null +++ b/tests/specs/worker/nonexistent_worker/__test__.jsonc @@ -0,0 +1,5 @@ +{ + "args": "run --allow-read nonexistent_worker.ts", + "output": "nonexistent_worker.out", + "exitCode": 1 +} diff --git a/tests/testdata/workers/nonexistent_worker.out b/tests/specs/worker/nonexistent_worker/nonexistent_worker.out similarity index 80% rename from tests/testdata/workers/nonexistent_worker.out rename to tests/specs/worker/nonexistent_worker/nonexistent_worker.out index a624c0b517..977d2af48a 100644 --- a/tests/testdata/workers/nonexistent_worker.out +++ b/tests/specs/worker/nonexistent_worker/nonexistent_worker.out @@ -1,3 +1,3 @@ -[WILDCARD]error: Uncaught (in worker "") Module not found "file:///[WILDCARD]/workers/doesnt_exist.js". +[WILDCARD]error: Uncaught (in worker "") Module not found "file:///[WILDCARD]/doesnt_exist.js". error: Uncaught (in promise) Error: Unhandled error in child worker. at Worker.#pollControl[WILDCARD] diff --git a/tests/testdata/workers/nonexistent_worker.ts b/tests/specs/worker/nonexistent_worker/nonexistent_worker.ts similarity index 100% rename from tests/testdata/workers/nonexistent_worker.ts rename to tests/specs/worker/nonexistent_worker/nonexistent_worker.ts diff --git a/tests/specs/worker/worker_async_error/__test__.jsonc b/tests/specs/worker/worker_async_error/__test__.jsonc new file mode 100644 index 0000000000..0e48d3f320 --- /dev/null +++ b/tests/specs/worker/worker_async_error/__test__.jsonc @@ -0,0 +1,5 @@ +{ + "args": "run -A --quiet --reload worker_async_error.ts", + "output": "worker_async_error.ts.out", + "exitCode": 1 +} diff --git a/tests/testdata/workers/async_error.ts b/tests/specs/worker/worker_async_error/async_error.ts similarity index 100% rename from tests/testdata/workers/async_error.ts rename to tests/specs/worker/worker_async_error/async_error.ts diff --git a/tests/testdata/workers/worker_async_error.ts b/tests/specs/worker/worker_async_error/worker_async_error.ts similarity index 100% rename from tests/testdata/workers/worker_async_error.ts rename to tests/specs/worker/worker_async_error/worker_async_error.ts diff --git a/tests/testdata/workers/worker_async_error.ts.out b/tests/specs/worker/worker_async_error/worker_async_error.ts.out similarity index 100% rename from tests/testdata/workers/worker_async_error.ts.out rename to tests/specs/worker/worker_async_error/worker_async_error.ts.out diff --git a/tests/specs/worker/worker_doest_stall_event_loop/__test__.jsonc b/tests/specs/worker/worker_doest_stall_event_loop/__test__.jsonc new file mode 100644 index 0000000000..a5ccc6cabd --- /dev/null +++ b/tests/specs/worker/worker_doest_stall_event_loop/__test__.jsonc @@ -0,0 +1,5 @@ +{ + "args": "run --quiet -A worker_doest_stall_event_loop.ts", + "output": "worker_doest_stall_event_loop.ts.out", + "exitCode": 0 +} diff --git a/tests/testdata/workers/worker_doest_stall_event_loop.ts b/tests/specs/worker/worker_doest_stall_event_loop/worker_doest_stall_event_loop.ts similarity index 100% rename from tests/testdata/workers/worker_doest_stall_event_loop.ts rename to tests/specs/worker/worker_doest_stall_event_loop/worker_doest_stall_event_loop.ts diff --git a/tests/testdata/workers/worker_doest_stall_event_loop.ts.out b/tests/specs/worker/worker_doest_stall_event_loop/worker_doest_stall_event_loop.ts.out similarity index 100% rename from tests/testdata/workers/worker_doest_stall_event_loop.ts.out rename to tests/specs/worker/worker_doest_stall_event_loop/worker_doest_stall_event_loop.ts.out diff --git a/tests/specs/worker/worker_error/__test__.jsonc b/tests/specs/worker/worker_error/__test__.jsonc new file mode 100644 index 0000000000..9c50a78563 --- /dev/null +++ b/tests/specs/worker/worker_error/__test__.jsonc @@ -0,0 +1,5 @@ +{ + "args": "run -A worker_error.ts", + "output": "worker_error.ts.out", + "exitCode": 1 +} diff --git a/tests/testdata/workers/error.ts b/tests/specs/worker/worker_error/error.ts similarity index 100% rename from tests/testdata/workers/error.ts rename to tests/specs/worker/worker_error/error.ts diff --git a/tests/testdata/workers/worker_error.ts b/tests/specs/worker/worker_error/worker_error.ts similarity index 100% rename from tests/testdata/workers/worker_error.ts rename to tests/specs/worker/worker_error/worker_error.ts diff --git a/tests/testdata/workers/worker_error.ts.out b/tests/specs/worker/worker_error/worker_error.ts.out similarity index 100% rename from tests/testdata/workers/worker_error.ts.out rename to tests/specs/worker/worker_error/worker_error.ts.out diff --git a/tests/specs/worker/worker_error_event/__test__.jsonc b/tests/specs/worker/worker_error_event/__test__.jsonc new file mode 100644 index 0000000000..a05481a132 --- /dev/null +++ b/tests/specs/worker/worker_error_event/__test__.jsonc @@ -0,0 +1,5 @@ +{ + "args": "run --quiet -A error_event.ts", + "output": "error_event.ts.out", + "exitCode": 1 +} diff --git a/tests/specs/worker/worker_error_event/error.ts b/tests/specs/worker/worker_error_event/error.ts new file mode 100644 index 0000000000..495971090d --- /dev/null +++ b/tests/specs/worker/worker_error_event/error.ts @@ -0,0 +1,5 @@ +function foo() { + throw new Error("foo"); +} + +foo(); diff --git a/tests/testdata/workers/error_event.ts b/tests/specs/worker/worker_error_event/error_event.ts similarity index 100% rename from tests/testdata/workers/error_event.ts rename to tests/specs/worker/worker_error_event/error_event.ts diff --git a/tests/testdata/workers/error_event.ts.out b/tests/specs/worker/worker_error_event/error_event.ts.out similarity index 100% rename from tests/testdata/workers/error_event.ts.out rename to tests/specs/worker/worker_error_event/error_event.ts.out diff --git a/tests/specs/worker/worker_ids_are_sequential/__test__.jsonc b/tests/specs/worker/worker_ids_are_sequential/__test__.jsonc new file mode 100644 index 0000000000..b90bebac80 --- /dev/null +++ b/tests/specs/worker/worker_ids_are_sequential/__test__.jsonc @@ -0,0 +1,5 @@ +{ + "args": "run --quiet -A worker_ids_are_sequential.ts", + "output": "worker_ids_are_sequential.ts.out", + "exitCode": 0 +} diff --git a/tests/testdata/workers/worker_ids_are_sequential.ts b/tests/specs/worker/worker_ids_are_sequential/worker_ids_are_sequential.ts similarity index 100% rename from tests/testdata/workers/worker_ids_are_sequential.ts rename to tests/specs/worker/worker_ids_are_sequential/worker_ids_are_sequential.ts diff --git a/tests/testdata/workers/worker_ids_are_sequential.ts.out b/tests/specs/worker/worker_ids_are_sequential/worker_ids_are_sequential.ts.out similarity index 100% rename from tests/testdata/workers/worker_ids_are_sequential.ts.out rename to tests/specs/worker/worker_ids_are_sequential/worker_ids_are_sequential.ts.out diff --git a/tests/specs/worker/worker_message_handler_error/__test__.jsonc b/tests/specs/worker/worker_message_handler_error/__test__.jsonc new file mode 100644 index 0000000000..ea00753a79 --- /dev/null +++ b/tests/specs/worker/worker_message_handler_error/__test__.jsonc @@ -0,0 +1,5 @@ +{ + "args": "run -A --quiet --reload worker_message_handler_error.ts", + "output": "worker_message_handler_error.ts.out", + "exitCode": 1 +} diff --git a/tests/testdata/workers/message_handler_error.ts b/tests/specs/worker/worker_message_handler_error/message_handler_error.ts similarity index 100% rename from tests/testdata/workers/message_handler_error.ts rename to tests/specs/worker/worker_message_handler_error/message_handler_error.ts diff --git a/tests/testdata/workers/worker_message_handler_error.ts b/tests/specs/worker/worker_message_handler_error/worker_message_handler_error.ts similarity index 100% rename from tests/testdata/workers/worker_message_handler_error.ts rename to tests/specs/worker/worker_message_handler_error/worker_message_handler_error.ts diff --git a/tests/testdata/workers/worker_message_handler_error.ts.out b/tests/specs/worker/worker_message_handler_error/worker_message_handler_error.ts.out similarity index 100% rename from tests/testdata/workers/worker_message_handler_error.ts.out rename to tests/specs/worker/worker_message_handler_error/worker_message_handler_error.ts.out diff --git a/tests/specs/worker/worker_nested_error/__test__.jsonc b/tests/specs/worker/worker_nested_error/__test__.jsonc new file mode 100644 index 0000000000..71d7c8109e --- /dev/null +++ b/tests/specs/worker/worker_nested_error/__test__.jsonc @@ -0,0 +1,5 @@ +{ + "args": "run -A worker_nested_error.ts", + "output": "worker_nested_error.ts.out", + "exitCode": 1 +} diff --git a/tests/specs/worker/worker_nested_error/error.ts b/tests/specs/worker/worker_nested_error/error.ts new file mode 100644 index 0000000000..495971090d --- /dev/null +++ b/tests/specs/worker/worker_nested_error/error.ts @@ -0,0 +1,5 @@ +function foo() { + throw new Error("foo"); +} + +foo(); diff --git a/tests/specs/worker/worker_nested_error/worker_error.ts b/tests/specs/worker/worker_nested_error/worker_error.ts new file mode 100644 index 0000000000..403223d0a7 --- /dev/null +++ b/tests/specs/worker/worker_nested_error/worker_error.ts @@ -0,0 +1,5 @@ +const worker = new Worker( + import.meta.resolve("./error.ts"), + { type: "module", name: "bar" }, +); +setTimeout(() => worker.terminate(), 30000); diff --git a/tests/testdata/workers/worker_nested_error.ts b/tests/specs/worker/worker_nested_error/worker_nested_error.ts similarity index 100% rename from tests/testdata/workers/worker_nested_error.ts rename to tests/specs/worker/worker_nested_error/worker_nested_error.ts diff --git a/tests/testdata/workers/worker_nested_error.ts.out b/tests/specs/worker/worker_nested_error/worker_nested_error.ts.out similarity index 77% rename from tests/testdata/workers/worker_nested_error.ts.out rename to tests/specs/worker/worker_nested_error/worker_nested_error.ts.out index 3622acfb3d..404b0aa3d3 100644 --- a/tests/testdata/workers/worker_nested_error.ts.out +++ b/tests/specs/worker/worker_nested_error/worker_nested_error.ts.out @@ -1,8 +1,8 @@ [WILDCARD]error: Uncaught (in worker "bar") (in promise) Error: foo[WILDCARD] throw new Error("foo"); ^ - at foo ([WILDCARD]/workers/error.ts:[WILDCARD]) - at [WILDCARD]/workers/error.ts:[WILDCARD] + at foo ([WILDCARD]/error.ts:[WILDCARD]) + at [WILDCARD]/error.ts:[WILDCARD] error: Uncaught (in worker "baz") (in promise) Error: Unhandled error in child worker. at Worker.#pollControl [WILDCARD] error: Uncaught (in promise) Error: Unhandled error in child worker. diff --git a/tests/specs/worker/worker_permissions_blob_local/__test__.jsonc b/tests/specs/worker/worker_permissions_blob_local/__test__.jsonc new file mode 100644 index 0000000000..27a747b3a5 --- /dev/null +++ b/tests/specs/worker/worker_permissions_blob_local/__test__.jsonc @@ -0,0 +1,5 @@ +{ + "args": "run --quiet --reload --allow-net=localhost:4545 permissions_blob_local.ts", + "output": "permissions_blob_local.ts.out", + "exitCode": 1 +} diff --git a/tests/testdata/workers/permissions_blob_local.ts b/tests/specs/worker/worker_permissions_blob_local/permissions_blob_local.ts similarity index 100% rename from tests/testdata/workers/permissions_blob_local.ts rename to tests/specs/worker/worker_permissions_blob_local/permissions_blob_local.ts diff --git a/tests/testdata/workers/permissions_blob_local.ts.out b/tests/specs/worker/worker_permissions_blob_local/permissions_blob_local.ts.out similarity index 100% rename from tests/testdata/workers/permissions_blob_local.ts.out rename to tests/specs/worker/worker_permissions_blob_local/permissions_blob_local.ts.out diff --git a/tests/specs/worker/worker_permissions_blob_remote/__test__.jsonc b/tests/specs/worker/worker_permissions_blob_remote/__test__.jsonc new file mode 100644 index 0000000000..f9d66b6b38 --- /dev/null +++ b/tests/specs/worker/worker_permissions_blob_remote/__test__.jsonc @@ -0,0 +1,5 @@ +{ + "args": "run --quiet --reload --allow-net=localhost:4545 permissions_blob_remote.ts", + "output": "permissions_blob_remote.ts.out", + "exitCode": 1 +} diff --git a/tests/testdata/workers/permissions_blob_remote.ts b/tests/specs/worker/worker_permissions_blob_remote/permissions_blob_remote.ts similarity index 100% rename from tests/testdata/workers/permissions_blob_remote.ts rename to tests/specs/worker/worker_permissions_blob_remote/permissions_blob_remote.ts diff --git a/tests/testdata/workers/permissions_blob_remote.ts.out b/tests/specs/worker/worker_permissions_blob_remote/permissions_blob_remote.ts.out similarity index 100% rename from tests/testdata/workers/permissions_blob_remote.ts.out rename to tests/specs/worker/worker_permissions_blob_remote/permissions_blob_remote.ts.out diff --git a/tests/specs/worker/worker_permissions_data_local/__test__.jsonc b/tests/specs/worker/worker_permissions_data_local/__test__.jsonc new file mode 100644 index 0000000000..8f118d8be3 --- /dev/null +++ b/tests/specs/worker/worker_permissions_data_local/__test__.jsonc @@ -0,0 +1,5 @@ +{ + "args": "run --quiet --reload --allow-net=localhost:4545 permissions_data_local.ts", + "output": "permissions_data_local.ts.out", + "exitCode": 1 +} diff --git a/tests/testdata/workers/permissions_data_local.ts b/tests/specs/worker/worker_permissions_data_local/permissions_data_local.ts similarity index 100% rename from tests/testdata/workers/permissions_data_local.ts rename to tests/specs/worker/worker_permissions_data_local/permissions_data_local.ts diff --git a/tests/testdata/workers/permissions_data_local.ts.out b/tests/specs/worker/worker_permissions_data_local/permissions_data_local.ts.out similarity index 100% rename from tests/testdata/workers/permissions_data_local.ts.out rename to tests/specs/worker/worker_permissions_data_local/permissions_data_local.ts.out diff --git a/tests/specs/worker/worker_permissions_data_remote/__test__.jsonc b/tests/specs/worker/worker_permissions_data_remote/__test__.jsonc new file mode 100644 index 0000000000..6096b4280a --- /dev/null +++ b/tests/specs/worker/worker_permissions_data_remote/__test__.jsonc @@ -0,0 +1,5 @@ +{ + "args": "run --quiet --reload --allow-net=localhost:4545 permissions_data_remote.ts", + "output": "permissions_data_remote.ts.out", + "exitCode": 1 +} diff --git a/tests/testdata/workers/permissions_data_remote.ts b/tests/specs/worker/worker_permissions_data_remote/permissions_data_remote.ts similarity index 100% rename from tests/testdata/workers/permissions_data_remote.ts rename to tests/specs/worker/worker_permissions_data_remote/permissions_data_remote.ts diff --git a/tests/testdata/workers/permissions_data_remote.ts.out b/tests/specs/worker/worker_permissions_data_remote/permissions_data_remote.ts.out similarity index 100% rename from tests/testdata/workers/permissions_data_remote.ts.out rename to tests/specs/worker/worker_permissions_data_remote/permissions_data_remote.ts.out diff --git a/tests/specs/worker/worker_permissions_dynamic_remote/__test__.jsonc b/tests/specs/worker/worker_permissions_dynamic_remote/__test__.jsonc new file mode 100644 index 0000000000..8343b17f69 --- /dev/null +++ b/tests/specs/worker/worker_permissions_dynamic_remote/__test__.jsonc @@ -0,0 +1,5 @@ +{ + "args": "run --quiet --reload --allow-net --unstable-worker-options ../../../testdata/workers/permissions_dynamic_remote.ts", + "output": "../../../testdata/workers/permissions_dynamic_remote.ts.out", + "exitCode": 1 +} diff --git a/tests/specs/worker/worker_permissions_remote_remote/__test__.jsonc b/tests/specs/worker/worker_permissions_remote_remote/__test__.jsonc new file mode 100644 index 0000000000..8cf7001586 --- /dev/null +++ b/tests/specs/worker/worker_permissions_remote_remote/__test__.jsonc @@ -0,0 +1,5 @@ +{ + "args": "run --quiet --reload --allow-net=localhost:4545 ../../../testdata/workers/permissions_remote_remote.ts", + "output": "permissions_remote_remote.ts.out", + "exitCode": 1 +} diff --git a/tests/testdata/workers/permissions_remote_remote.ts.out b/tests/specs/worker/worker_permissions_remote_remote/permissions_remote_remote.ts.out similarity index 77% rename from tests/testdata/workers/permissions_remote_remote.ts.out rename to tests/specs/worker/worker_permissions_remote_remote/permissions_remote_remote.ts.out index a095f1938b..e5bdfc2dc1 100644 --- a/tests/testdata/workers/permissions_remote_remote.ts.out +++ b/tests/specs/worker/worker_permissions_remote_remote/permissions_remote_remote.ts.out @@ -1,4 +1,4 @@ error: Uncaught (in worker "") Requires net access to "example.com:443", run again with the --allow-net flag - at http://localhost:4545/workers/static_remote.ts:2:8 + at http://localhost:4545/[WILDCARD]/static_remote.ts:2:8 error: Uncaught (in promise) Error: Unhandled error in child worker. at Worker.#pollControl [WILDCARD] diff --git a/tests/specs/worker/worker_terminate_tla_crash/__test__.jsonc b/tests/specs/worker/worker_terminate_tla_crash/__test__.jsonc new file mode 100644 index 0000000000..a3e04da857 --- /dev/null +++ b/tests/specs/worker/worker_terminate_tla_crash/__test__.jsonc @@ -0,0 +1,4 @@ +{ + "args": "run --quiet --reload terminate_tla_crash.js", + "output": "terminate_tla_crash.js.out" +} diff --git a/tests/testdata/workers/terminate_tla_crash.js b/tests/specs/worker/worker_terminate_tla_crash/terminate_tla_crash.js similarity index 100% rename from tests/testdata/workers/terminate_tla_crash.js rename to tests/specs/worker/worker_terminate_tla_crash/terminate_tla_crash.js diff --git a/tests/testdata/workers/terminate_tla_crash.js.out b/tests/specs/worker/worker_terminate_tla_crash/terminate_tla_crash.js.out similarity index 100% rename from tests/testdata/workers/terminate_tla_crash.js.out rename to tests/specs/worker/worker_terminate_tla_crash/terminate_tla_crash.js.out