add assertOps sanitizer in cli/js/ unit tests

cli/js/net_test.ts

@@ -54,7 +54,7 @@ testPerm({ net: true }, async function netTcpConcurrentAccept(): Promise<void> {
   const p1 = listener.accept().catch(checkErr);
   await Promise.race([p, p1]);
   listener.close();
-  await [p, p1];
+  await Promise.all([p, p1]);
   assertEquals(acceptErrCount, 1);
 });
 

cli/js/performance_test.ts

@@ -1,10 +1,13 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-import { testPerm, assert } from "./test_util.ts";
+import { testPerm, assert, createResolvable } from "./test_util.ts";
 
-testPerm({ hrtime: false }, function now(): void {
+testPerm({ hrtime: false }, async function performanceNow(): Promise<void> {
+  const resolvable = createResolvable();
   const start = performance.now();
   setTimeout((): void => {
     const end = performance.now();
     assert(end - start >= 10);
+    resolvable.resolve();
   }, 10);
+  await resolvable;
 });

cli/js/signal_test.ts

@@ -4,7 +4,8 @@ import {
   testPerm,
   assert,
   assertEquals,
-  assertThrows
+  assertThrows,
+  createResolvable
 } from "./test_util.ts";
 
 function defer(n: number): Promise<void> {
@@ -101,15 +102,13 @@ if (Deno.build.os === "win") {
     );
   });
 } else {
-  testPerm({ run: true, net: true }, async function signalStreamTest(): Promise<
-    void
-  > {
+  testPerm({ run: true }, async function signalStreamTest(): Promise<void> {
+    const resolvable = createResolvable();
     // This prevents the program from exiting.
     const t = setInterval(() => {}, 1000);
 
     let c = 0;
     const sig = Deno.signal(Deno.Signal.SIGUSR1);
-
     setTimeout(async () => {
       await defer(20);
       for (const _ of Array(3)) {
@@ -118,6 +117,7 @@ if (Deno.build.os === "win") {
         await defer(20);
       }
       sig.dispose();
+      resolvable.resolve();
     });
 
     for await (const _ of sig) {
@@ -126,25 +126,30 @@ if (Deno.build.os === "win") {
 
     assertEquals(c, 3);
 
-    clearTimeout(t);
+    clearInterval(t);
+    // Defer for a moment to allow interval promise to resolve
+    await defer(20);
+    await resolvable;
   });
 
-  testPerm(
-    { run: true, net: true },
-    async function signalPromiseTest(): Promise<void> {
-      // This prevents the program from exiting.
-      const t = setInterval(() => {}, 1000);
+  testPerm({ run: true }, async function signalPromiseTest(): Promise<void> {
+    const resolvable = createResolvable();
+    // This prevents the program from exiting.
+    const t = setInterval(() => {}, 1000);
 
-      const sig = Deno.signal(Deno.Signal.SIGUSR1);
-      setTimeout(() => {
-        Deno.kill(Deno.pid, Deno.Signal.SIGUSR1);
-      }, 20);
-      await sig;
-      sig.dispose();
+    const sig = Deno.signal(Deno.Signal.SIGUSR1);
+    setTimeout(() => {
+      Deno.kill(Deno.pid, Deno.Signal.SIGUSR1);
+      resolvable.resolve();
+    }, 20);
+    await sig;
+    sig.dispose();
 
-      clearTimeout(t);
-    }
-  );
+    clearInterval(t);
+    // Defer for a moment to allow interval promise to resolve
+    await defer(20);
+    await resolvable;
+  });
 
   testPerm({ run: true }, async function signalShorthandsTest(): Promise<void> {
     let s: Deno.SignalStream;

cli/js/test_util.ts

@@ -106,11 +106,37 @@ function normalizeTestPermissions(perms: TestPermissions): Permissions {
   };
 }
 
+// Wrap `TestFunction` in additional assertion that makes sure
+// the test case does not leak async "ops" - ie. number of async
+// completed ops after the test is the same as number of dispatched
+// ops. Note that "unref" ops are ignored since in nature that are
+// optional.
+function assertOps(fn: Deno.TestFunction): Deno.TestFunction {
+  return async function asyncOpSanitizer(): Promise<void> {
+    const pre = Deno.metrics();
+    await fn();
+    const post = Deno.metrics();
+    // We're checking diff because one might spawn HTTP server in the background
+    // that will be a pending async op before test starts.
+    assertEquals(
+      post.opsDispatchedAsync - pre.opsDispatchedAsync,
+      post.opsCompletedAsync - pre.opsCompletedAsync,
+      `Test case is leaking async ops.
+    Before:
+      - dispatched: ${pre.opsDispatchedAsync}
+      - completed: ${pre.opsCompletedAsync}
+    After: 
+      - dispatched: ${post.opsDispatchedAsync}
+      - completed: ${post.opsCompletedAsync}`
+    );
+  };
+}
+
 // Wrap `TestFunction` in additional assertion that makes sure
 // the test case does not "leak" resources - ie. resource table after
 // the test has exactly the same contents as before the test.
 function assertResources(fn: Deno.TestFunction): Deno.TestFunction {
-  return async function(): Promise<void> {
+  return async function resourceSanitizer(): Promise<void> {
     const preResources = Deno.resources();
     await fn();
     const postResources = Deno.resources();
@@ -131,7 +157,7 @@ export function testPerm(perms: TestPermissions, fn: Deno.TestFunction): void {
     return;
   }
 
-  Deno.test(fn.name, assertResources(fn));
+  Deno.test(fn.name, assertResources(assertOps(fn)));
 }
 
 export function test(fn: Deno.TestFunction): void {

cli/js/timers_test.ts

@@ -1,5 +1,11 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-import { test, assert, assertEquals, assertNotEquals } from "./test_util.ts";
+import {
+  test,
+  createResolvable,
+  assert,
+  assertEquals,
+  assertNotEquals
+} from "./test_util.ts";
 
 function deferred(): {
   promise: Promise<{}>;
@@ -178,8 +184,6 @@ test(async function timeoutCallbackThis(): Promise<void> {
 });
 
 test(async function timeoutBindThis(): Promise<void> {
-  function noop(): void {}
-
   const thisCheckPassed = [null, undefined, window, globalThis];
 
   const thisCheckFailed = [
@@ -194,41 +198,37 @@ test(async function timeoutBindThis(): Promise<void> {
     Object.prototype
   ];
 
-  thisCheckPassed.forEach(
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (thisArg: any): void => {
-      let hasThrown = 0;
-      try {
-        setTimeout.call(thisArg, noop, 1);
-        hasThrown = 1;
-      } catch (err) {
-        if (err instanceof TypeError) {
-          hasThrown = 2;
-        } else {
-          hasThrown = 3;
-        }
+  for (const thisArg of thisCheckPassed) {
+    const resolvable = createResolvable();
+    let hasThrown = 0;
+    try {
+      setTimeout.call(thisArg, () => resolvable.resolve(), 1);
+      hasThrown = 1;
+    } catch (err) {
+      if (err instanceof TypeError) {
+        hasThrown = 2;
+      } else {
+        hasThrown = 3;
       }
-      assertEquals(hasThrown, 1);
     }
-  );
+    await resolvable;
+    assertEquals(hasThrown, 1);
+  }
 
-  thisCheckFailed.forEach(
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (thisArg: any): void => {
-      let hasThrown = 0;
-      try {
-        setTimeout.call(thisArg, noop, 1);
-        hasThrown = 1;
-      } catch (err) {
-        if (err instanceof TypeError) {
-          hasThrown = 2;
-        } else {
-          hasThrown = 3;
-        }
+  for (const thisArg of thisCheckFailed) {
+    let hasThrown = 0;
+    try {
+      setTimeout.call(thisArg, () => {}, 1);
+      hasThrown = 1;
+    } catch (err) {
+      if (err instanceof TypeError) {
+        hasThrown = 2;
+      } else {
+        hasThrown = 3;
       }
-      assertEquals(hasThrown, 2);
     }
-  );
+    assertEquals(hasThrown, 2);
+  }
 });
 
 test(async function clearTimeoutShouldConvertToNumber(): Promise<void> {

cli/js/unit_tests.ts

@@ -62,7 +62,6 @@ import "./utime_test.ts";
 import "./write_file_test.ts";
 import "./performance_test.ts";
 import "./version_test.ts";
-import "./workers_test.ts";
 
 if (import.meta.main) {
   await Deno.runTests();

cli/tests/integration_tests.rs

@@ -798,14 +798,10 @@ itest!(_026_redirect_javascript {
   http_server: true,
 });
 
-itest!(_026_workers {
-  args: "run --reload 026_workers.ts",
-  output: "026_workers.ts.out",
-});
-
-itest!(workers_basic {
-  args: "run --reload workers_basic.ts",
-  output: "workers_basic.out",
+itest!(workers {
+  args: "run --reload --allow-net workers_test.ts",
+  http_server: true,
+  output: "workers_test.out",
 });
 
 itest!(_027_redirect_typescript {

cli/tests/subdir/nested_worker.js

@@ -9,7 +9,6 @@ jsWorker.onerror = _e => {
 };
 
 jsWorker.onmessage = e => {
-  console.log("js worker on message");
   postMessage({ type: "msg", text: e });
   close();
 };

cli/tests/subdir/test_worker.js

@@ -5,8 +5,6 @@ if (self.name !== "jsWorker") {
 }
 
 onmessage = function(e) {
-  console.log(e.data);
-
   if (thrown === false) {
     thrown = true;
     throw new SyntaxError("[test error]");
@@ -17,6 +15,5 @@ onmessage = function(e) {
 };
 
 onerror = function() {
-  console.log("called onerror in worker");
   return false;
 };

cli/tests/subdir/test_worker.ts

@@ -3,7 +3,6 @@ if (self.name !== "tsWorker") {
 }
 
 onmessage = function(e): void {
-  console.log(e.data);
   postMessage(e.data);
   close();
 };

cli/tests/subdir/test_worker_basic.js

@@ -6,12 +6,10 @@ if (self.name !== "jsWorker") {
 }
 
 onmessage = function(e) {
-  console.log("jsWorker onmessage", e.data);
   postMessage(e.data);
   close();
 };
 
 onerror = function() {
-  console.log("called onerror in worker");
   return false;
 };

cli/tests/workers_test.out

@@ -0,0 +1,7 @@
+running 4 tests
+OK     workersBasic [WILDCARD]
+OK     nestedWorker [WILDCARD]
+OK     workerThrowsWhenExecuting [WILDCARD]
+OK     workerCanUseFetch [WILDCARD]
+
+test result: OK 4 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out [WILDCARD]