4 files changed, 29 insertions, 0 deletions
diff --git a/cli/tests/integration/run_tests.rs b/cli/tests/integration/run_tests.rs
index df92ad422..5116db295 100644
--- a/cli/tests/integration/run_tests.rs
+++ b/cli/tests/integration/run_tests.rs
@@ -1188,6 +1188,12 @@ itest!(worker_close_race {
   output: "worker_close_race.js.out",
 });
 
+itest!(worker_drop_handle_race {
+  args: "run --quiet --reload --allow-read worker_drop_handle_race.js",
+  output: "worker_drop_handle_race.js.out",
+  exit_code: 1,
+});
+
 itest!(worker_message_before_close {
   args: "run --quiet --reload --allow-read worker_message_before_close.js",
   output: "worker_message_before_close.js.out",
diff --git a/cli/tests/testdata/worker_drop_handle_race.js b/cli/tests/testdata/worker_drop_handle_race.js
new file mode 100644
index 000000000..d637ac8c2
--- /dev/null
+++ b/cli/tests/testdata/worker_drop_handle_race.js
@@ -0,0 +1,12 @@
+// Copyright 2018-2021 the Deno authors. All rights reserved. MIT license.
+
+// https://github.com/denoland/deno/issues/11342
+// Test for a panic that happens when the main thread's event loop finishes
+// running while the worker's event loop is still spinning.
+
+// The exception thrown in the worker will not terminate the worker, but it will
+// propagate to the main thread and cause it to exit.
+new Worker(
+  new URL("./workers/drop_handle_race.js", import.meta.url).href,
+  { type: "module" },
+);
diff --git a/cli/tests/testdata/worker_drop_handle_race.js.out b/cli/tests/testdata/worker_drop_handle_race.js.out
new file mode 100644
index 000000000..71dfde620
--- /dev/null
+++ b/cli/tests/testdata/worker_drop_handle_race.js.out
@@ -0,0 +1,8 @@
+error: Uncaught (in worker "") Error
+  throw new Error();
+        ^
+    at [WILDCARD]/workers/drop_handle_race.js:2:9
+    at fire (deno:ext/timers/[WILDCARD])
+    at handleTimerMacrotask (deno:ext/timers/[WILDCARD])
+error: Uncaught (in promise) Error: Unhandled error event reached main worker.
+    at Worker.#pollControl (deno:runtime/js/11_workers.js:[WILDCARD])
diff --git a/cli/tests/testdata/workers/drop_handle_race.js b/cli/tests/testdata/workers/drop_handle_race.js
new file mode 100644
index 000000000..30676a600
--- /dev/null
+++ b/cli/tests/testdata/workers/drop_handle_race.js
@@ -0,0 +1,3 @@
+setTimeout(() => {
+  throw new Error();
+}, 1000);