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

PR-URL: nodejs/node#46441 Fixes: nodejs/node#45910 Reviewed-By: Moshe Atlow <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> (cherry picked from commit 61c65b066b098cf47f89206212864ec1cddb8782)
nodejs · Feb 8, 2023 · d6f071a · d6f071a
1 parent 69e4f83
commit d6f071a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/lib/internal/per_context/primordials.js b/lib/internal/per_context/primordials.js
@@ -65,6 +65,7 @@ exports.SafeWeakSet = WeakSet
 exports.String = String
 exports.StringPrototypeEndsWith = (haystack, needle, index) => haystack.endsWith(needle, index)
 exports.StringPrototypeIncludes = (str, needle) => str.includes(needle)
+exports.StringPrototypeIndexOf = (str, needle, offset) => str.indexOf(needle, offset)
 exports.StringPrototypeMatch = (str, reg) => str.match(reg)
 exports.StringPrototypeRepeat = (str, times) => str.repeat(times)
 exports.StringPrototypeReplace = (str, search, replacement) =>

diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
@@ -1,4 +1,4 @@
-// https://github.com/nodejs/node/blob/9eb363a3e00dbba572756c7ed314273f17ea8e2e/lib/internal/test_runner/runner.js
+// https://github.com/nodejs/node/blob/61c65b066b098cf47f89206212864ec1cddb8782/lib/internal/test_runner/runner.js
 'use strict'
 const {
   ArrayFrom,
@@ -13,6 +13,8 @@ const {
   PromisePrototypeThen,
   SafePromiseAll,
   SafeSet,
+  StringPrototypeIndexOf,
+  StringPrototypeSlice,
   StringPrototypeStartsWith
 } = require('#internal/per_context/primordials')
 
@@ -43,6 +45,7 @@ const { once } = require('events')
 
 const kFilterArgs = ['--test']
 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) {
@@ -123,6 +126,14 @@ 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
 
@@ -176,7 +187,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 @@ sync pass todo (*ms)
   *
  async assertion fail (*ms)
   AssertionError [ERR_ASSERTION]: Expected values to be strictly equal:
-  
+
   true !== false
-  
+
   *
   *
   *