@matter/testing 0.13.0-alpha.0-20250318-c1aa38b08 → 0.13.0-alpha.0-20250322-f085fa576

package/dist/esm/mocks/time.js

@@ -4,10 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Boot } from "./boot.js";
+const registry = {
+  timers: /* @__PURE__ */ new Set(),
+  register(_timer) {
+  },
+  unregister(_timer) {
+  }
+};
 class MockTimer {
-  constructor(mockTime, durationMs, callback) {
-    this.mockTime = mockTime;
-    this.durationMs = durationMs;
+  name = "Test";
+  systemId = 0;
+  intervalMs = 0;
+  isPeriodic = false;
+  #mockTime;
+  #durationMs;
+  isRunning = false;
+  callback;
+  constructor(mockTime, name, durationMs, callback) {
+    this.name = name;
+    this.#mockTime = mockTime;
+    this.#durationMs = durationMs;
     if (this instanceof MockInterval) {
       this.callback = callback;
     } else {
@@ -17,30 +33,26 @@ class MockTimer {
       };
     }
   }
-  name = "Test";
-  systemId = 0;
-  intervalMs = 0;
-  isPeriodic = false;
-  isRunning = false;
-  callback;
   start() {
-    this.mockTime.callbackAtTime(this.mockTime.nowMs() + this.durationMs, this.callback);
+    registry.register(this);
+    this.#mockTime.callbackAtTime(this.#mockTime.nowMs() + this.#durationMs, this.callback);
     this.isRunning = true;
     return this;
   }
   stop() {
-    this.mockTime.removeCallback(this.callback);
+    registry.unregister(this);
+    this.#mockTime.removeCallback(this.callback);
     this.isRunning = false;
     return this;
   }
 }
 class MockInterval extends MockTimer {
-  constructor(mockTime, durationMs, callback) {
+  constructor(mockTime, name, durationMs, callback) {
     const intervalCallback = async () => {
       mockTime.callbackAtTime(mockTime.nowMs() + durationMs, intervalCallback);
       await callback();
     };
-    super(mockTime, durationMs, intervalCallback);
+    super(mockTime, name, durationMs, intervalCallback);
   }
 }
 function isAsync(fn) {
@@ -73,18 +85,18 @@ const MockTime = {
   nowMs() {
     return nowMs;
   },
-  getTimer(_name, durationMs, callback) {
-    return new MockTimer(this, durationMs, callback);
+  getTimer(name, durationMs, callback) {
+    return new MockTimer(this, name, durationMs, callback);
   },
-  getPeriodicTimer(_name, intervalMs, callback) {
-    return new MockInterval(this, intervalMs, callback);
+  getPeriodicTimer(name, intervalMs, callback) {
+    return new MockInterval(this, name, intervalMs, callback);
   },
   /**
    * Resolve a promise with time dependency.
    *
    * Moves time forward until the promise resolves.
    */
-  async resolve(promise) {
+  async resolve(promise, { stepMs, macrotasks } = {}) {
     let resolved = false;
     let result;
     let error;
@@ -100,7 +112,11 @@ const MockTime = {
     );
     let timeAdvanced = 0;
     while (!resolved) {
-      await new Promise((resolve) => setTimeout(() => resolve(), 0));
+      if (macrotasks) {
+        await new Promise((resolve) => setTimeout(() => resolve(), 0));
+      } else {
+        await MockTime.yield();
+      }
       if (resolved) {
         break;
       }
@@ -109,8 +125,12 @@ const MockTime = {
           "Mock timeout: Promise did not resolve within one (virtual) hour, probably not going to happen"
         );
       }
-      await this.advance(1e3);
-      timeAdvanced += 1e3;
+      if (stepMs) {
+        await this.advance(stepMs);
+      } else {
+        await this.advance(1e3);
+        timeAdvanced += 1e3;
+      }
       if (resolved) {
         break;
       }
@@ -126,8 +146,7 @@ const MockTime = {
    */
   async advance(ms) {
     const newTimeMs = nowMs + ms;
-    while (true) {
-      if (callbacks.length === 0) break;
+    while (callbacks.length) {
       const { atMs, callback } = callbacks[0];
       if (atMs > newTimeMs) break;
       callbacks.shift();
@@ -137,20 +156,17 @@ const MockTime = {
     nowMs = newTimeMs;
   },
   /**
-   * Yield to scheduled microtasks.  This means that all code paths waiting
-   * on resolved promises (including await) will proceed before this method
-   * returns.
+   * Yield to scheduled microtasks.  This means that all code paths waiting on resolved promises (including await)
+   * will proceed before this method returns.
    */
   async yield() {
     await Promise.resolve();
   },
   /**
-   * Due to its implementation, an older version of yield() would actually
-   * yield to microtasks three times.  Our tests then depended on this
-   * functionality -- one yield could trigger up to three nested awaits.
+   * Due to its implementation, an older version of yield() would actually yield to microtasks three times.  Our tests
+   * then depended on this functionality -- one yield could trigger up to three nested awaits.
    *
-   * To make this clear, the version of yield() that emulates old behavior
-   * is called "yield3".
+   * To make this clear, the version of yield() that emulates old behavior is called "yield3".
    */
   async yield3() {
     await Promise.resolve();
@@ -158,14 +174,12 @@ const MockTime = {
     await Promise.resolve();
   },
   /**
-   * Hook a method and invoke a callback just before the method completes.
-   * Unhooks after completion.
+   * Hook a method and invoke a callback just before the method completes. Unhooks after completion.
    *
-   * Handles both synchronous and asynchronous methods.  The interceptor
-   * should match the async-ness of the intercepted method.
+   * Handles both synchronous and asynchronous methods.  The interceptor should match the async-ness of the
+   * intercepted method.
    *
-   * The interceptor can optionally access and/or replace the resolve/reject
-   * value.
+   * The interceptor can optionally access and/or replace the resolve/reject value.
    */
   interceptOnce(obj, method, interceptor) {
     const original = obj[method];
@@ -207,6 +221,12 @@ const MockTime = {
       };
     }
   },
+  /**
+   * Count the number of registered timers with a specific name.
+   */
+  timerCountFor(name) {
+    return [...registry.timers].filter((timer) => timer.name === name).length;
+  },
   callbackAtTime(atMs, callback) {
     callbacks.push({ atMs, callback });
     callbacks.sort(({ atMs: atMsA }, { atMs: atMsB }) => atMsA - atMsB);
@@ -219,6 +239,9 @@ const MockTime = {
 };
 let reinstallTime;
 function timeSetup(Time) {
+  registry.register = Time.register;
+  registry.unregister = Time.unregister;
+  registry.timers = Time.timers;
   Time.startup.systemMs = Time.startup.processMs = 0;
   real = Time.get();
   MockTime.sleep = real.sleep;

package/dist/esm/mocks/time.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/mocks/time.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/dist/esm/nodejs-reporter.js

@@ -83,7 +83,7 @@ class NodejsReporter {
         std.out("\n");
       }
       const failure = this.#failures[i];
-      const index = `Failure ${ansi.bold((i + 1).toString())} of ${this.#failures.length}`;
+      const index = `\u26A0 Failure ${ansi.bold((i + 1).toString())} of ${this.#failures.length}`;
       const title = `${index} ${this.#formatName(failure.suite, failure.test, failure.step)}`;
       FailureReporter.report(std.out, failure.detail, title);
     }

package/dist/esm/nodejs-reporter.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/nodejs-reporter.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/dist/esm/runner.d.ts

@@ -7,6 +7,7 @@ import { Package, Progress } from "#tools";
 import { TestOptions } from "./options.js";
 import { Reporter } from "./reporter.js";
 export declare class TestRunner {
+    #private;
     readonly pkg: Package;
     readonly progress: Progress;
     readonly options: TestOptions;
@@ -16,6 +17,5 @@ export declare class TestRunner {
     runNode(format?: "esm" | "cjs"): Promise<void>;
     runWeb(manual?: boolean): Promise<void>;
     loadFiles(format: "esm" | "cjs"): Promise<string[]>;
-    private run;
 }
 //# sourceMappingURL=runner.d.ts.map

package/dist/esm/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/runner.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAQ,OAAO,EAAE,QAAQ,EAAO,MAAM,QAAQ,CAAC;AAQtD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIzC,qBAAa,UAAU;IAKf,QAAQ,CAAC,GAAG,EAAE,OAAO;IACrB,QAAQ,CAAC,QAAQ,EAAE,QAAQ;IAC3B,QAAQ,CAAC,OAAO,EAAE,WAAW;IANjC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,OAAO,CAAC,IAAI,CAAmB;gBAGlB,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,WAAW;IA8B3B,OAAO,CAAC,MAAM,GAAE,KAAK,GAAG,KAAa;IAIrC,MAAM,CAAC,MAAM,UAAQ;IAIrB,SAAS,CAAC,MAAM,EAAE,KAAK,GAAG,KAAK;YAmBvB,GAAG;CAMpB"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/runner.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAQ,OAAO,EAAE,QAAQ,EAAO,MAAM,QAAQ,CAAC;AAStD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIzC,qBAAa,UAAU;;IAKf,QAAQ,CAAC,GAAG,EAAE,OAAO;IACrB,QAAQ,CAAC,QAAQ,EAAE,QAAQ;IAC3B,QAAQ,CAAC,OAAO,EAAE,WAAW;IANjC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,OAAO,CAAC,IAAI,CAAmB;gBAGlB,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,WAAW;IA8B3B,OAAO,CAAC,MAAM,GAAE,KAAK,GAAG,KAAa;IAIrC,MAAM,CAAC,MAAM,UAAQ;IAIrB,SAAS,CAAC,MAAM,EAAE,KAAK,GAAG,KAAK;CA0GxC"}

package/dist/esm/runner.js

@@ -5,7 +5,8 @@
  */
 import { ansi, Progress, std } from "#tools";
 import debug from "debug";
-import { relative } from "node:path";
+import { readFile } from "node:fs/promises";
+import { dirname, relative, resolve } from "node:path";
 import { chip } from "./chip/chip.js";
 import { FailureReporter } from "./failure-reporter.js";
 import { NodejsReporter } from "./nodejs-reporter.js";
@@ -43,13 +44,13 @@ class TestRunner {
   reporter;
   spec = Array();
   async runNode(format = "esm") {
-    await this.run(this.progress, () => testNodejs(this, format));
+    await this.#run(this.progress, () => testNodejs(this, format));
   }
   async runWeb(manual = false) {
-    await this.run(this.progress, () => testWeb(this, manual));
+    await this.#run(this.progress, () => testWeb(this, manual));
   }
   async loadFiles(format) {
-    const tests = [];
+    const tests = Array();
     for (let spec of this.spec) {
       spec = spec.replace(/\.ts$/, ".js");
       spec = relative(this.pkg.path, spec);
@@ -58,17 +59,76 @@ class TestRunner {
       }
       tests.push(...await this.pkg.glob(spec));
     }
+    for (let i = 0; i < tests.length; i++) {
+      if (tests[i].indexOf("/src/") === -1) {
+        continue;
+      }
+      tests[i] = await this.#mapSourceToTest(tests[i]);
+    }
     if (!tests.length) {
       fatal(`No files match ${this.spec.join(", ")}`);
     }
     return [...listSupportFiles(format), ...tests];
   }
-  async run(progress, runner) {
+  async #run(progress, runner) {
     await runner();
     if (progress.status !== Progress.Status.Success) {
       fatal(`Test ${progress.status.toLowerCase()}, aborting`);
     }
   }
+  async #mapSourceToTest(filename) {
+    try {
+      const src = await readFile(filename, "utf-8");
+      const [, args] = src.match(/\/\/ matter-test (.*)/) ?? [];
+      if (args) {
+        return this.#parseMarkerArgs(args, filename);
+      }
+    } catch (e) {
+    }
+    return filename.replace("/src/", "/test/");
+  }
+  #parseMarkerArgs(args, filename) {
+    const parts = args.match(/[a-z]+=(?:"(?:[^"\\]|\\.)+"|[^"]\S+)/g);
+    if (!parts) {
+      throw new Error("No matter-test parameters detected");
+    }
+    let file;
+    let module;
+    for (const part of parts) {
+      const equalPos = part.indexOf("=");
+      const name = part.substring(0, equalPos);
+      let value = part.substring(equalPos + 1);
+      if (value[0] === '"') {
+        value = value.substring(1, value.length - 2).replace(/\\"/g, '"').replace(/\\\\/g, '"');
+      }
+      switch (name) {
+        case "file":
+          file = value;
+          break;
+        case "module":
+          module = value;
+          break;
+        default:
+          throw new Error(`Unrecognized matter-test parameter "${name}"`);
+      }
+    }
+    if (file === void 0) {
+      throw new Error(`matter-test parameter "file" is required`);
+    }
+    if (file.startsWith("./") || file.startsWith("../")) {
+      file = resolve(dirname(filename), file);
+    }
+    let testPkg;
+    if (module === void 0) {
+      testPkg = this.pkg;
+    } else {
+      testPkg = this.pkg.findPackage(module);
+      if (testPkg === void 0) {
+        throw new Error(`Unknown matter-test module "${module}"`);
+      }
+    }
+    return testPkg.resolve("test", file);
+  }
 }
 function fatal(message) {
   std.err.write(ansi.bright.red(`

package/dist/esm/runner.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/runner.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,MAAe,UAAU,WAAW;AAC7C,OAAO,WAAW;AAClB,SAAS,gBAAgB;AACzB,SAAS,YAAY;AAErB,SAAS,uBAAuB;AAChC,SAAS,sBAAsB;AAC/B,SAAS,kBAAkB;AAG3B,SAAS,wBAAwB;AACjC,SAAS,eAAe;AAEjB,MAAM,WAAW;AAAA,EAIpB,YACa,KACA,UACA,SACX;AAHW;AACA;AACA;AAET,SAAK,SAAS;AAEd,SAAK,WAAW,IAAK,cAAc,eAAe;AAAA,MAC9C,cAAc;AACV,cAAM,QAAQ;AAAA,MAClB;AAAA,MAES,QAAQ,QAAuB;AACpC,YAAI,IAAI,MAAM,IAAI;AAClB,wBAAgB,OAAO,IAAI,KAAK,QAAQ,kBAAkB;AAC1D,YAAI,IAAI,MAAM,IAAI;AAClB,gBAAQ,KAAK,CAAC;AAAA,MAClB;AAAA,IACJ,EAAG;AAEH,QAAI,QAAQ,SAAS,QAAW;AAC5B,WAAK,OAAO,CAAC,kBAAkB;AAAA,IACnC,WAAW,MAAM,QAAQ,QAAQ,IAAI,GAAG;AACpC,WAAK,OAAO,QAAQ;AAAA,IACxB,OAAO;AACH,WAAK,OAAO,CAAC,QAAQ,IAAI;AAAA,IAC7B;AAEA,QAAI,QAAQ,OAAO;AACf,YAAM,OAAO,SAAS;AAAA,IAC1B;AAAA,EACJ;AAAA,EAlCS;AAAA,EACD,OAAO,MAAc;AAAA,EAmC7B,MAAM,QAAQ,SAAwB,OAAO;AACzC,UAAM,KAAK,IAAI,KAAK,UAAU,MAAM,WAAW,MAAM,MAAM,CAAC;AAAA,EAChE;AAAA,EAEA,MAAM,OAAO,SAAS,OAAO;AACzB,UAAM,KAAK,IAAI,KAAK,UAAU,MAAM,QAAQ,MAAM,MAAM,CAAC;AAAA,EAC7D;AAAA,EAEA,MAAM,UAAU,QAAuB;AACnC,UAAM,QAAQ,CAAC;AACf,aAAS,QAAQ,KAAK,MAAM;AACxB,aAAO,KAAK,QAAQ,SAAS,KAAK;AAClC,aAAO,SAAS,KAAK,IAAI,MAAM,IAAI;AACnC,UAAI,CAAC,KAAK,WAAW,GAAG,KAAK,CAAC,KAAK,WAAW,QAAQ,KAAK,CAAC,KAAK,WAAW,OAAO,GAAG;AAClF,eAAO,SAAS,MAAM,IAAI,IAAI;AAAA,MAClC;AAEA,YAAM,KAAK,GAAI,MAAM,KAAK,IAAI,KAAK,IAAI,CAAE;AAAA,IAC7C;AAEA,QAAI,CAAC,MAAM,QAAQ;AACf,YAAM,kBAAkB,KAAK,KAAK,KAAK,IAAI,CAAC,EAAE;AAAA,IAClD;AAEA,WAAO,CAAC,GAAG,iBAAiB,MAAM,GAAG,GAAG,KAAK;AAAA,EACjD;AAAA,EAEA,MAAc,IAAI,UAAoB,QAA6B;AAC/D,UAAM,OAAO;AACb,QAAI,SAAS,WAAW,SAAS,OAAO,SAAS;AAC7C,YAAM,QAAQ,SAAS,OAAO,YAAY,CAAC,YAAY;AAAA,IAC3D;AAAA,EACJ;AACJ;AAEA,SAAS,MAAM,SAAiB;AAC5B,MAAI,IAAI,MAAM,KAAK,OAAO,IAAI;AAAA,EAAK,OAAO;AAAA;AAAA,CAAM,CAAC;AACjD,UAAQ,KAAK,CAAC;AAClB;",
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter/testing",
-    "version": "0.13.0-alpha.0-20250318-c1aa38b08",
+    "version": "0.13.0-alpha.0-20250322-f085fa576",
     "description": "Test harness for running JavaScript and Matter certification tests",
     "type": "module",
     "scripts": {
@@ -45,7 +45,7 @@
         "#tools/ansi-text": "@matter/tools/ansi-text"
     },
     "dependencies": {
-        "@matter/tools": "0.13.0-alpha.0-20250318-c1aa38b08",
+        "@matter/tools": "0.13.0-alpha.0-20250322-f085fa576",
         "@types/express": "^5.0.0",
         "ansi-colors": "^4.1.3",
         "chai": "^4.5.0",

package/src/mocks/time.ts

@@ -11,6 +11,12 @@ type TimerCallback = () => any;
 type MockTimeLike = typeof MockTime;
 export interface MockTime extends MockTimeLike {}
 
+const registry = {
+    timers: new Set<MockTimer>(),
+    register(_timer: MockTimer) {},
+    unregister(_timer: MockTimer) {},
+};
+
 // Must match matter.js Timer interface
 class MockTimer {
     name = "Test";
@@ -18,14 +24,18 @@ class MockTimer {
     intervalMs = 0;
     isPeriodic = false;
 
+    #mockTime: MockTime;
+    #durationMs: number;
+
     isRunning = false;
     private readonly callback: TimerCallback;
 
-    constructor(
-        private readonly mockTime: MockTime,
-        private readonly durationMs: number,
-        callback: TimerCallback,
-    ) {
+    constructor(mockTime: MockTime, name: string, durationMs: number, callback: TimerCallback) {
+        this.name = name;
+
+        this.#mockTime = mockTime;
+        this.#durationMs = durationMs;
+
         if (this instanceof MockInterval) {
             this.callback = callback;
         } else {
@@ -37,25 +47,27 @@ class MockTimer {
     }
 
     start() {
-        this.mockTime.callbackAtTime(this.mockTime.nowMs() + this.durationMs, this.callback);
+        registry.register(this);
+        this.#mockTime.callbackAtTime(this.#mockTime.nowMs() + this.#durationMs, this.callback);
         this.isRunning = true;
         return this;
     }
 
     stop() {
-        this.mockTime.removeCallback(this.callback);
+        registry.unregister(this);
+        this.#mockTime.removeCallback(this.callback);
         this.isRunning = false;
         return this;
     }
 }
 
 class MockInterval extends MockTimer {
-    constructor(mockTime: MockTime, durationMs: number, callback: TimerCallback) {
+    constructor(mockTime: MockTime, name: string, durationMs: number, callback: TimerCallback) {
         const intervalCallback = async () => {
             mockTime.callbackAtTime(mockTime.nowMs() + durationMs, intervalCallback);
             await callback();
         };
-        super(mockTime, durationMs, intervalCallback);
+        super(mockTime, name, durationMs, intervalCallback);
     }
 }
 
@@ -105,12 +117,12 @@ export const MockTime = {
         return nowMs;
     },
 
-    getTimer(_name: string, durationMs: number, callback: TimerCallback): MockTimer {
-        return new MockTimer(this, durationMs, callback);
+    getTimer(name: string, durationMs: number, callback: TimerCallback): MockTimer {
+        return new MockTimer(this, name, durationMs, callback);
     },
 
-    getPeriodicTimer(_name: string, intervalMs: number, callback: TimerCallback): MockTimer {
-        return new MockInterval(this, intervalMs, callback);
+    getPeriodicTimer(name: string, intervalMs: number, callback: TimerCallback): MockTimer {
+        return new MockInterval(this, name, intervalMs, callback);
     },
 
     /**
@@ -118,7 +130,7 @@ export const MockTime = {
      *
      * Moves time forward until the promise resolves.
      */
-    async resolve<T>(promise: PromiseLike<T>) {
+    async resolve<T>(promise: PromiseLike<T>, { stepMs, macrotasks }: { stepMs?: number; macrotasks?: boolean } = {}) {
         let resolved = false;
         let result: T | undefined;
         let error: any;
@@ -137,10 +149,14 @@ export const MockTime = {
         let timeAdvanced = 0;
         while (!resolved) {
             // Interestingly, a Time.yield() works in almost every case.  However, on Node SubtleCrypto.deriveBits hangs
-            // if you only yield via microtask.  It seems to require yielding via macrotask.  So we use setTimeout here.
-            // Probably related to entropy collection but I think it's safe to classify as a Node bug.  Tested on
-            // version 20.11.0
-            await new Promise<void>(resolve => setTimeout(() => resolve(), 0));
+            // if you only yield via microtask.  It seems to require yielding via macrotask.  So we optionally use
+            // setTimeout here. Probably related to entropy collection but I think it's safe to classify as a Node bug.
+            // Tested on version 20.11.0
+            if (macrotasks) {
+                await new Promise<void>(resolve => setTimeout(() => resolve(), 0));
+            } else {
+                await MockTime.yield();
+            }
 
             if (resolved) {
                 break;
@@ -153,12 +169,16 @@ export const MockTime = {
                 );
             }
 
-            // Advance time exponentially, trying for granularity but also OK performance.  Note that we are not only
-            // advancing time but also yielding event loop.  So it's possible if we run out of time it's just because
-            // there were too few yields in one virtual hour.  As designed currently it's 360 macrotasks and 360
-            // microtasks (360 loops w/ 1 macro- and 1 micro-yield)
-            await this.advance(1000);
-            timeAdvanced += 1000;
+            if (stepMs) {
+                await this.advance(stepMs);
+            } else {
+                // Advance time exponentially, trying for granularity but also OK performance.  Note that we are not only
+                // advancing time but also yielding event loop.  So it's possible if we run out of time it's just because
+                // there were too few yields in one virtual hour.  As designed currently it's 360 macrotasks and 360
+                // microtasks (360 loops w/ 1 macro- and 1 micro-yield)
+                await this.advance(1000);
+                timeAdvanced += 1000;
+            }
 
             if (resolved) {
                 break;
@@ -180,8 +200,7 @@ export const MockTime = {
     async advance(ms: number) {
         const newTimeMs = nowMs + ms;
 
-        while (true) {
-            if (callbacks.length === 0) break;
+        while (callbacks.length) {
             const { atMs, callback } = callbacks[0];
             if (atMs > newTimeMs) break;
             callbacks.shift();
@@ -193,21 +212,18 @@ export const MockTime = {
     },
 
     /**
-     * Yield to scheduled microtasks.  This means that all code paths waiting
-     * on resolved promises (including await) will proceed before this method
-     * returns.
+     * Yield to scheduled microtasks.  This means that all code paths waiting on resolved promises (including await)
+     * will proceed before this method returns.
      */
     async yield() {
         await Promise.resolve();
     },
 
     /**
-     * Due to its implementation, an older version of yield() would actually
-     * yield to microtasks three times.  Our tests then depended on this
-     * functionality -- one yield could trigger up to three nested awaits.
+     * Due to its implementation, an older version of yield() would actually yield to microtasks three times.  Our tests
+     * then depended on this functionality -- one yield could trigger up to three nested awaits.
      *
-     * To make this clear, the version of yield() that emulates old behavior
-     * is called "yield3".
+     * To make this clear, the version of yield() that emulates old behavior is called "yield3".
      */
     async yield3() {
         await Promise.resolve();
@@ -216,14 +232,12 @@ export const MockTime = {
     },
 
     /**
-     * Hook a method and invoke a callback just before the method completes.
-     * Unhooks after completion.
+     * Hook a method and invoke a callback just before the method completes. Unhooks after completion.
      *
-     * Handles both synchronous and asynchronous methods.  The interceptor
-     * should match the async-ness of the intercepted method.
+     * Handles both synchronous and asynchronous methods.  The interceptor should match the async-ness of the
+     * intercepted method.
      *
-     * The interceptor can optionally access and/or replace the resolve/reject
-     * value.
+     * The interceptor can optionally access and/or replace the resolve/reject value.
      */
     interceptOnce<NameT extends string, ReturnT, ObjT extends { [N in NameT]: (...args: any) => ReturnT }>(
         obj: ObjT,
@@ -272,6 +286,13 @@ export const MockTime = {
         }
     },
 
+    /**
+     * Count the number of registered timers with a specific name.
+     */
+    timerCountFor(name: string) {
+        return [...registry.timers].filter(timer => timer.name === name).length;
+    },
+
     callbackAtTime(atMs: number, callback: TimerCallback) {
         callbacks.push({ atMs, callback });
         callbacks.sort(({ atMs: atMsA }, { atMs: atMsB }) => atMsA - atMsB);
@@ -286,7 +307,16 @@ export const MockTime = {
 
 let reinstallTime: undefined | (() => void);
 
-export function timeSetup(Time: { startup: { systemMs: number; processMs: number }; get(): unknown }) {
+export function timeSetup(Time: {
+    startup: { systemMs: number; processMs: number };
+    get(): unknown;
+    register(timer: MockTimer): void;
+    unregister(timer: MockTimer): void;
+    timers: Set<MockTimer>;
+}) {
+    registry.register = Time.register;
+    registry.unregister = Time.unregister;
+    registry.timers = Time.timers;
     Time.startup.systemMs = Time.startup.processMs = 0;
     real = Time.get();
     (MockTime as any).sleep = (real as any).sleep;

package/src/nodejs-reporter.ts

@@ -105,7 +105,7 @@ export abstract class NodejsReporter implements Reporter {
             }
 
             const failure = this.#failures[i];
-            const index = `Failure ${ansi.bold((i + 1).toString())} of ${this.#failures.length}`;
+            const index = `⚠ Failure ${ansi.bold((i + 1).toString())} of ${this.#failures.length}`;
             const title = `${index} ${this.#formatName(failure.suite, failure.test, failure.step)}`;
 
             FailureReporter.report(std.out, failure.detail, title);