fixup! test: accomodate multi-global tests in WPT{Runner,TestSpec,Report}

Author: panva

test/common/wpt.js

@@ -324,13 +324,14 @@ class WPTTestSpec {
     this.filename = filename;
     this.variant = variant;
     this.globalScope = globalScope;
+    this.rules = [...new Set(rules)];
 
     this.requires = new Set();
     this.failedTests = [];
     this.flakyTests = [];
     this.skipReasons = [];
     this.skippedTests = [];
-    for (const item of rules) {
+    for (const item of this.rules) {
       if (item.requires.length) {
         for (const req of item.requires) {
           this.requires.add(req);
@@ -648,6 +649,31 @@ const limit = (concurrency) => {
   return execute;
 };
 
+function getUnexpectedPasses(queue, results) {
+  const specsByRule = new Map();
+  for (const spec of queue) {
+    for (const rule of spec.rules) {
+      if (Array.isArray(rule.fail?.expected)) {
+        const specs = specsByRule.get(rule) || [];
+        specs.push(spec);
+        specsByRule.set(rule, specs);
+      }
+    }
+  }
+
+  const unexpectedPasses = [];
+  for (const [rule, specs] of specsByRule) {
+    for (const expectedToFail of rule.fail.expected) {
+      const failed = specs.some((spec) =>
+        results[spec.getStatusKey()]?.fail?.expected?.includes(expectedToFail));
+      if (!failed) {
+        unexpectedPasses.push(`${rule.key}:${expectedToFail}`);
+      }
+    }
+  }
+  return unexpectedPasses;
+}
+
 class WPTRunner {
   constructor(path, { concurrency = os.availableParallelism() - 1 || 1 } = {}) {
     // RISC-V has very limited virtual address space in the currently common
@@ -907,32 +933,7 @@ class WPTRunner {
         }
       }
 
-      const unexpectedPasses = [];
-      for (const specs of queue) {
-        const key = specs.getStatusKey();
-
-        // File has no expected failures
-        if (!specs.failedTests.length) {
-          continue;
-        }
-
-        // File was (maybe even conditionally) skipped
-        if (this.results[key]?.skip) {
-          continue;
-        }
-
-        // Full check: every expected to fail test is present
-        const _unexpectedPasses = specs.failedTests.filter((expectedToFail) => {
-          if (specs.flakyTests.includes(expectedToFail)) {
-            return false;
-          }
-          return this.results[key]?.fail?.expected?.includes(expectedToFail) !== true;
-        });
-        if (_unexpectedPasses.length) {
-          unexpectedPasses.push(..._unexpectedPasses.map((name) => `${key}:${name}`));
-          continue;
-        }
-      }
+      const unexpectedPasses = getUnexpectedPasses(queue, this.results);
 
       // Write the report on clean exit. The report is also written
       // incrementally after each spec completes (see completionCallback)
@@ -1171,6 +1172,7 @@ class WPTRunner {
 }
 
 module.exports = {
+  getUnexpectedPasses,
   harness: harnessMock,
   ResourceLoader,
   WPTTestSpec,

test/parallel/test-common-wpt-any.js

@@ -2,7 +2,10 @@
 
 require('../common');
 const assert = require('assert');
-const { WPTTestSpec } = require('../common/wpt');
+const {
+  getUnexpectedPasses,
+  WPTTestSpec,
+} = require('../common/wpt');
 
 const specs = WPTTestSpec.from(
   'WebCryptoAPI',
@@ -71,3 +74,38 @@ assert.deepStrictEqual(
   scopedSpecs.map(({ skipReasons }) => skipReasons),
   [[], ['worker only']],
 );
+
+const sourceRule = {
+  key: 'getPublicKey.tentative.https.any.js',
+  requires: [],
+  fail: { expected: ['shared failure'] },
+};
+const workerRule = {
+  key: 'getPublicKey.tentative.https.any.worker.html',
+  requires: [],
+  fail: { expected: ['worker failure'] },
+};
+const expectedFailureSpecs = WPTTestSpec.from(
+  'WebCryptoAPI',
+  'getPublicKey.tentative.https.any.js',
+  [sourceRule],
+  (spec) => (spec.isWebWorkerTest() ? [workerRule] : []),
+);
+const expectedResults = {
+  'getPublicKey.tentative.https.any.html': {
+    fail: { expected: ['shared failure'] },
+  },
+  'getPublicKey.tentative.https.any.worker.html': {
+    fail: { expected: ['worker failure'] },
+  },
+};
+
+assert.deepStrictEqual(
+  getUnexpectedPasses(expectedFailureSpecs, expectedResults),
+  [],
+);
+delete expectedResults['getPublicKey.tentative.https.any.worker.html'].fail;
+assert.deepStrictEqual(
+  getUnexpectedPasses(expectedFailureSpecs, expectedResults),
+  ['getPublicKey.tentative.https.any.worker.html:worker failure'],
+);

test/wpt/status/hr-time.cjs

@@ -19,7 +19,7 @@ module.exports = {
     },
   } : {}),
 
-  'idlharness.any.html': {
+  'idlharness.any.js': {
     fail: {
       expected: [
         'Window interface: attribute performance',

test/wpt/status/wasm/jsapi.json

@@ -5,34 +5,6 @@
   "esm-integration/namespace-instance.tentative.any.js": {
     "skip": "pending https://github.com/nodejs/node/pull/59024"
   },
-  "esm-integration/source-phase-string-builtins.tentative.any.worker.html": {
-    "fail": {
-      "note": "TODO(avivkeller): expected? investigate",
-      "expected": [
-        "String builtins should be supported in source phase imports",
-        "Source phase import should properly expose string builtin exports",
-        "Source phase import should handle string builtin import reflection correctly"
-      ]
-    }
-  },
-  "esm-integration/source-phase-string-constants.tentative.any.worker.html": {
-    "fail": {
-      "note": "TODO(avivkeller): expected? investigate",
-      "expected": [
-        "String constants from wasm:js/string-constants should be supported in source phase imports",
-        "Source phase import should properly expose string constants exports",
-        "Source phase import should handle string constants import reflection correctly"
-      ]
-    }
-  },
-  "esm-integration/source-phase.tentative.any.worker.html": {
-    "fail": {
-      "note": "TODO(avivkeller): expected? investigate",
-      "expected": [
-        "Source phase imports"
-      ]
-    }
-  },
   "esm-integration/v128-tdz.tentative.any.js": {
     "skip": "v128 undefined Wasm bindings not yet supported in V8"
   },

test/wpt/status/webidl.json

@@ -20,7 +20,7 @@
       ]
     }
   },
-  "ecmascript-binding/global-object-implicit-this-value.any.html": {
+  "ecmascript-binding/global-object-implicit-this-value.any.js": {
     "fail": {
       "expected": [
         "Global object's getter throws when called on incompatible object",
@@ -34,13 +34,7 @@
   },
   "ecmascript-binding/global-object-implicit-this-value.any.worker.html": {
     "fail": {
-      "note": "TODO(avivkeller): expected? investigate",
       "expected": [
-        "Global object's getter throws when called on incompatible object",
-        "Global object's setter throws when called on incompatible object",
-        "Global object's operation throws when called on incompatible object",
-        "Global object's getter works when called on null / undefined",
-        "Global object's setter works when called on null / undefined",
         "Global object's operation works when called on null / undefined"
       ]
     }
@@ -59,7 +53,7 @@
       ]
     }
   },
-  "ecmascript-binding/no-regexp-special-casing.any.html": {
+  "ecmascript-binding/no-regexp-special-casing.any.js": {
     "fail": {
       "expected": [
         "Can be used as an object implementing a callback interface"