test_runner: parse yaml

nodejs · Dec 11, 2022 · 6e9dad3 · 6e9dad3
1 parent 43f9bb3
commit 6e9dad3
Show file tree

Hide file tree

Showing 6 changed files with 775 additions and 16 deletions.
diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
@@ -4,7 +4,6 @@ const {
   ArrayPrototypeFilter,
   ArrayPrototypeForEach,
   ArrayPrototypeIncludes,
-  ArrayPrototypeJoin,
   ArrayPrototypePush,
   ArrayPrototypeSlice,
   ArrayPrototypeSort,
@@ -35,6 +34,7 @@ const { kEmptyObject } = require('internal/util');
 const { createTestTree } = require('internal/test_runner/harness');
 const { kDefaultIndent, kSubtestsFailed, Test } = require('internal/test_runner/test');
 const { TapParser } = require('internal/test_runner/tap_parser');
+const { parseYAML } = require('internal/test_runner/yaml_parser');
 const { TokenKind } = require('internal/test_runner/tap_lexer');
 
 const {
@@ -130,17 +130,7 @@ class FileTest extends Test {
   #handleReportItem({ kind, node, nesting = 0 }) {
     const indent = StringPrototypeRepeat(kDefaultIndent, nesting + 1);
 
-    const details = (diagnostic) => {
-      return (
-        diagnostic && {
-          __proto__: null,
-          yaml:
-            `${indent}  ` +
-            ArrayPrototypeJoin(diagnostic, `\n${indent}  `) +
-            '\n',
-        }
-      );
-    };
+    const details = (diagnostic) => diagnostic && parseYAML(diagnostic);
 
     switch (kind) {
       case TokenKind.TAP_VERSION:

diff --git a/lib/internal/test_runner/tap_stream.js b/lib/internal/test_runner/tap_stream.js
@@ -83,11 +83,10 @@ class TapStream extends Readable {
   }
 
   #details(indent, data = kEmptyObject) {
-    const { error, duration, yaml } = data;
+    const { error, duration_ms } = data;
     let details = `${indent}  ---\n`;
 
-    details += `${yaml ? yaml : ''}`;
-    details += jsToYaml(indent, 'duration_ms', duration);
+    details += jsToYaml(indent, 'duration_ms', duration_ms);
     details += jsToYaml(indent, null, error);
     details += `${indent}  ...\n`;
     this.#tryPush(details);

diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
@@ -676,7 +676,7 @@ class Test extends AsyncResource {
       this.reportSubtest();
     }
     let directive;
-    const details = { __proto__: null, duration: this.#duration() };
+    const details = { __proto__: null, duration_ms: this.#duration() };
 
     if (this.skipped) {
       directive = this.reporter.getSkip(this.message);

diff --git a/lib/internal/test_runner/yaml_parser.js b/lib/internal/test_runner/yaml_parser.js
@@ -0,0 +1,110 @@
+'use strict';
+const {
+  codes: {
+    ERR_TEST_FAILURE,
+  }
+} = require('internal/errors');
+const AssertionError = require('internal/assert/assertion_error');
+const {
+  ArrayPrototypeJoin,
+  Error,
+  Number,
+  NumberIsNaN,
+  RegExpPrototypeExec,
+  StringPrototypeEndsWith,
+  StringPrototypeRepeat,
+  StringPrototypeSlice,
+  StringPrototypeStartsWith,
+  StringPrototypeSubstring,
+} = primordials;
+
+const kYamlKeyRegex = /^(\s+)?(\w+):(\s)+([>|][-+])?(.*)$/;
+const kStackDelimiter = '    at ';
+
+function reConstructError(parsedYaml) {
+  if (!('error' in parsedYaml)) {
+    return parsedYaml;
+  }
+  const isAssertionError = parsedYaml.code === 'ERR_ASSERTION' ||
+    'actual' in parsedYaml || 'expected' in parsedYaml || 'operator' in parsedYaml;
+  const isTestFauilure = parsedYaml.code === 'ERR_TEST_FAILURE' || 'failureType' in parsedYaml;
+  const stack = parsedYaml.stack ? kStackDelimiter + ArrayPrototypeJoin(parsedYaml.stack, `\n${kStackDelimiter}`) : '';
+
+  // eslint-disable-next-line no-restricted-syntax
+  let error = new Error(parsedYaml.error);
+  error.stack = stack;
+  error.code = parsedYaml.code;
+
+  if (isAssertionError) {
+    error = new AssertionError({
+      message: parsedYaml.error,
+      actual: parsedYaml.actual,
+      expected: parsedYaml.expected,
+      operator: parsedYaml.operator
+    });
+    error.stack = stack;
+  }
+
+  if (isTestFauilure) {
+    error = new ERR_TEST_FAILURE(error, parsedYaml.failureType);
+    error.stack = stack;
+  }
+
+  parsedYaml.error = error;
+  delete parsedYaml.stack;
+  delete parsedYaml.code;
+  delete parsedYaml.failureType;
+  delete parsedYaml.actual;
+  delete parsedYaml.expected;
+  delete parsedYaml.operator;
+
+  return parsedYaml;
+}
+
+function getYamlValue(value, key) {
+  if (StringPrototypeStartsWith(value, "'") && StringPrototypeEndsWith(value, "'")) {
+    return StringPrototypeSlice(value, 1, -1);
+  }
+  if (value === 'true') {
+    return true;
+  }
+  if (value === 'false') {
+    return false;
+  }
+  if (value && !NumberIsNaN(value)) {
+    return Number(value);
+  }
+  return value;
+}
+
+function parseYAML(lines) {
+  const result = {};
+  let isInYamlBlock = false;
+  for (const line of lines) {
+    if (isInYamlBlock && !StringPrototypeStartsWith(line, StringPrototypeRepeat(' ', isInYamlBlock.indent))) {
+      result[isInYamlBlock.key] = isInYamlBlock.key === 'stack' ?
+        result[isInYamlBlock.key] : ArrayPrototypeJoin(result[isInYamlBlock.key], '\n');
+      isInYamlBlock = false;
+    }
+    if (isInYamlBlock) {
+      const blockLine = StringPrototypeSubstring(line, isInYamlBlock.indent);
+      result[isInYamlBlock.key].push(blockLine);
+      continue;
+    }
+    const match = RegExpPrototypeExec(kYamlKeyRegex, line);
+    if (match !== null) {
+      const { 1: leadingSpaces, 2: key, 4: block, 5: value } = match;
+      if (block) {
+        isInYamlBlock = { key, indent: (leadingSpaces?.length ?? 0) + 2 };
+        result[key] = [];
+      } else {
+        result[key] = getYamlValue(value, key);
+      }
+    }
+  }
+  return reConstructError(result);
+}
+
+module.exports = {
+  parseYAML,
+};
diff --git a/test/message/test_runner_output_cli.js b/test/message/test_runner_output_cli.js
@@ -0,0 +1,6 @@
+// Flags: --no-warnings
+'use strict';
+require('../common');
+const spawn = require('node:child_process').spawn;
+spawn(process.execPath,
+      ['--no-warnings', '--test', 'test/message/test_runner_output.js'], { stdio: 'inherit' });