test_runner: top-level diagnostics not ommited when running with --test

PR-URL: #46441 Fixes: #45910 Reviewed-By: Moshe Atlow <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]>
nodejs · Feb 18, 2023 · b31aabb · b31aabb
1 parent 2c8c9f9
commit b31aabb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
@@ -15,6 +15,8 @@ const {
   SafePromiseAllSettledReturnVoid,
   SafeMap,
   SafeSet,
+  StringPrototypeIndexOf,
+  StringPrototypeSlice,
   StringPrototypeStartsWith,
 } = primordials;
 
@@ -51,6 +53,7 @@ const {
 
 const kFilterArgs = ['--test', '--experimental-test-coverage', '--watch'];
 const kFilterArgValues = ['--test-reporter', '--test-reporter-destination'];
+const kDiagnosticsFilterArgs = ['tests', 'pass', 'fail', 'cancelled', 'skipped', 'todo', 'duration_ms'];
 
 // TODO(cjihrig): Replace this with recursive readdir once it lands.
 function processPath(path, testFiles, options) {
@@ -130,6 +133,13 @@ function getRunArgs({ path, inspectPort }) {
 
 class FileTest extends Test {
   #buffer = [];
+  #checkNestedComment({ comment }) {
+    const firstSpaceIndex = StringPrototypeIndexOf(comment, ' ');
+    if (firstSpaceIndex === -1) return false;
+    const secondSpaceIndex = StringPrototypeIndexOf(comment, ' ', firstSpaceIndex + 1);
+    return secondSpaceIndex === -1 &&
+          ArrayPrototypeIncludes(kDiagnosticsFilterArgs, StringPrototypeSlice(comment, 0, firstSpaceIndex));
+  }
   #handleReportItem({ kind, node, nesting = 0 }) {
     nesting += 1;
 
@@ -183,7 +193,7 @@ class FileTest extends Test {
         break;
 
       case TokenKind.COMMENT:
-        if (nesting === 1) {
+        if (nesting === 1 && this.#checkNestedComment(node)) {
           // Ignore file top level diagnostics
           break;
         }

diff --git a/test/message/test_runner_output_cli.out b/test/message/test_runner_output_cli.out
@@ -629,6 +629,12 @@ TAP version 13
         *
       ...
     1..65
+    # Warning: Test "unhandled rejection - passes but warns" generated asynchronous activity after the test ended. This activity created the error "Error: rejected from unhandled rejection fail" and would have caused the test to fail, but instead triggered an unhandledRejection event.
+    # Warning: Test "async unhandled rejection - passes but warns" generated asynchronous activity after the test ended. This activity created the error "Error: rejected from async unhandled rejection fail" and would have caused the test to fail, but instead triggered an unhandledRejection event.
+    # Warning: Test "immediate throw - passes but warns" generated asynchronous activity after the test ended. This activity created the error "Error: thrown from immediate throw fail" and would have caused the test to fail, but instead triggered an uncaughtException event.
+    # Warning: Test "immediate reject - passes but warns" generated asynchronous activity after the test ended. This activity created the error "Error: rejected from immediate reject fail" and would have caused the test to fail, but instead triggered an unhandledRejection event.
+    # Warning: Test "callback called twice in different ticks" generated asynchronous activity after the test ended. This activity created the error "Error [ERR_TEST_FAILURE]: callback invoked multiple times" and would have caused the test to fail, but instead triggered an uncaughtException event.
+    # Warning: Test "callback async throw after done" generated asynchronous activity after the test ended. This activity created the error "Error: thrown from callback async throw after done" and would have caused the test to fail, but instead triggered an uncaughtException event.
 not ok 1 - *test_runner_output.js
   ---
   duration_ms: *

diff --git a/test/message/test_runner_output_spec_reporter.out b/test/message/test_runner_output_spec_reporter.out
@@ -58,9 +58,9 @@
 
  async assertion fail (*ms)
   AssertionError [ERR_ASSERTION]: Expected values to be strictly equal:
-  
+
   true !== false
-  
+
   *
   *
   *
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,9 +58,9 @@ @@
      async assertion fail (*ms)
       AssertionError [ERR_ASSERTION]: Expected values to be strictly equal:
       true !== false
       *
       *
       *
@@ Expand Down @@