@fluidframework/test-utils 2.0.0-internal.2.4.0 → 2.0.0-internal.3.0.0

package/dist/timeoutUtils.d.ts

@@ -2,18 +2,30 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
+import { Container } from "@fluidframework/container-loader";
 export declare const defaultTimeoutDurationMs = 250;
 export interface TimeoutWithError {
+    /**
+     * Timeout duration in milliseconds, if it is great than 0 and not Infinity
+     * If it is undefined, then it will use test timeout if we are in side the test function
+     * Otherwise, there is no timeout
+     */
     durationMs?: number;
     reject?: true;
     errorMsg?: string;
 }
 export interface TimeoutWithValue<T = void> {
+    /**
+     * Timeout duration in milliseconds, if it is great than 0 and not Infinity
+     * If it is undefined, then it will use test timeout if we are in side the test function
+     * Otherwise, there is no timeout
+     */
     durationMs?: number;
     reject: false;
     value: T;
 }
 export declare type PromiseExecutor<T = void> = (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void;
 export declare function timeoutAwait<T = void>(promise: PromiseLike<T>, timeoutOptions?: TimeoutWithError | TimeoutWithValue<T>): Promise<T>;
+export declare function ensureContainerConnected(container: Container): Promise<void>;
 export declare function timeoutPromise<T = void>(executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void, timeoutOptions?: TimeoutWithError | TimeoutWithValue<T>): Promise<T>;
 //# sourceMappingURL=timeoutUtils.d.ts.map

package/dist/timeoutUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"timeoutUtils.d.ts","sourceRoot":"","sources":["../src/timeoutUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAE5C,MAAM,WAAW,gBAAgB;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,IAAI,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AACD,MAAM,WAAW,gBAAgB,CAAC,CAAC,GAAG,IAAI;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,CAAC,CAAC;CACZ;AAED,oBAAY,eAAe,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,IAAI,KAAK,IAAI,CAAC;AAE/H,wBAAsB,YAAY,CAAC,CAAC,GAAG,IAAI,EACvC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,EACvB,cAAc,GAAE,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,CAAM,cAG9D;AAED,wBAAsB,cAAc,CAAC,CAAC,GAAG,IAAI,EACzC,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,IAAI,KAAK,IAAI,EAChG,cAAc,GAAE,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,CAAM,GAC5D,OAAO,CAAC,CAAC,CAAC,CA0BZ"}
+{"version":3,"file":"timeoutUtils.d.ts","sourceRoot":"","sources":["../src/timeoutUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAI7D,eAAO,MAAM,wBAAwB,MAAM,CAAC;AA2F5C,MAAM,WAAW,gBAAgB;IAC7B;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,IAAI,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AACD,MAAM,WAAW,gBAAgB,CAAC,CAAC,GAAG,IAAI;IACtC;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,CAAC,CAAC;CACZ;AAED,oBAAY,eAAe,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,IAAI,KAAK,IAAI,CAAC;AAE/H,wBAAsB,YAAY,CAAC,CAAC,GAAG,IAAI,EACvC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,EACvB,cAAc,GAAE,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,CAAM,cAG9D;AAED,wBAAsB,wBAAwB,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAIlF;AAqCD,wBAAsB,cAAc,CAAC,CAAC,GAAG,IAAI,EACzC,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,IAAI,KAAK,IAAI,EAChG,cAAc,GAAE,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,CAAM,GAC5D,OAAO,CAAC,CAAC,CAAC,CAyBZ"}

package/dist/timeoutUtils.js

@@ -4,25 +4,111 @@
  * Licensed under the MIT License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.timeoutPromise = exports.timeoutAwait = exports.defaultTimeoutDurationMs = void 0;
+exports.timeoutPromise = exports.ensureContainerConnected = exports.timeoutAwait = exports.defaultTimeoutDurationMs = void 0;
+const common_utils_1 = require("@fluidframework/common-utils");
+// @deprecated this value is no longer used
 exports.defaultTimeoutDurationMs = 250;
+// TestTimeout class manage tracking of test timeout. It create a timer when timeout is in effect,
+// and provide a promise that will be reject before the test timeout happen with a `timeBuffer` of 15 ms.
+// Once rejected, a new TestTimeout object will be create for the timeout.
+const timeBuffer = 15; // leave 15 ms leeway for finish processing
+class TestTimeout {
+    constructor() {
+        this.timeout = 0;
+        this.rejected = false;
+        this.deferred = new common_utils_1.Deferred();
+        // Ignore rejection for timeout promise if no one is waiting for it.
+        this.deferred.promise.catch(() => { });
+    }
+    static reset(runnable) {
+        TestTimeout.clear();
+        TestTimeout.instance.resetTimer(runnable);
+    }
+    static clear() {
+        if (TestTimeout.instance.rejected) {
+            TestTimeout.instance = new TestTimeout();
+        }
+        else {
+            TestTimeout.instance.clearTimer();
+        }
+    }
+    static getInstance() {
+        return TestTimeout.instance;
+    }
+    async getPromise() {
+        return this.deferred.promise;
+    }
+    getTimeout() {
+        return this.timeout;
+    }
+    resetTimer(runnable) {
+        (0, common_utils_1.assert)(!this.timer, "clearTimer should have been called before reset");
+        (0, common_utils_1.assert)(!this.deferred.isCompleted, "can't reset a completed TestTimeout");
+        // Check the test timeout setting
+        const timeout = runnable.timeout();
+        if (!(Number.isFinite(timeout) && timeout > 0)) {
+            return;
+        }
+        // subtract a buffer
+        this.timeout = Math.max(timeout - timeBuffer, 1);
+        // Set up timer to reject near the test timeout.
+        this.timer = setTimeout(() => {
+            this.deferred.reject(this);
+            this.rejected = true;
+        }, this.timeout);
+    }
+    clearTimer() {
+        if (this.timer) {
+            clearTimeout(this.timer);
+            this.timer = undefined;
+        }
+    }
+}
+TestTimeout.instance = new TestTimeout();
+// only register if we are running with mocha-test-setup loaded
+if (globalThis.getMochaModule !== undefined) {
+    // patching resetTimeout and clearTimeout on the runnable object
+    // so we can track when test timeout are enforced
+    const mochaModule = globalThis.getMochaModule();
+    const runnablePrototype = mochaModule.Runnable.prototype;
+    // eslint-disable-next-line @typescript-eslint/unbound-method
+    const oldResetTimeoutFunc = runnablePrototype.resetTimeout;
+    runnablePrototype.resetTimeout = function () {
+        oldResetTimeoutFunc.call(this);
+        TestTimeout.reset(this);
+    };
+    // eslint-disable-next-line @typescript-eslint/unbound-method
+    const oldClearTimeoutFunc = runnablePrototype.clearTimeout;
+    runnablePrototype.clearTimeout = function () {
+        TestTimeout.clear();
+        oldClearTimeoutFunc.call(this);
+    };
+}
 async function timeoutAwait(promise, timeoutOptions = {}) {
     return Promise.race([promise, timeoutPromise(() => { }, timeoutOptions)]);
 }
 exports.timeoutAwait = timeoutAwait;
-async function timeoutPromise(executor, timeoutOptions = {}) {
+async function ensureContainerConnected(container) {
+    if (!container.connected) {
+        return timeoutPromise((resolve) => container.once("connected", () => resolve()));
+    }
+}
+exports.ensureContainerConnected = ensureContainerConnected;
+// Create a promise based on the timeout options
+async function getTimeoutPromise(executor, timeoutOptions, err) {
     var _a;
-    const timeout = timeoutOptions.durationMs !== undefined
-        && Number.isFinite(timeoutOptions.durationMs)
-        && timeoutOptions.durationMs > 0
-        ? timeoutOptions.durationMs : exports.defaultTimeoutDurationMs;
-    // create the timeout error outside the async task, so its callstack includes
-    // the original call site, this makes it easier to debug
-    const err = timeoutOptions.reject === false
-        ? undefined
-        : new Error(`${(_a = timeoutOptions.errorMsg) !== null && _a !== void 0 ? _a : "Timed out"}(${timeout}ms)`);
+    const timeout = (_a = timeoutOptions.durationMs) !== null && _a !== void 0 ? _a : 0;
+    if (timeout <= 0 || !Number.isFinite(timeout)) {
+        return new Promise(executor);
+    }
     return new Promise((resolve, reject) => {
-        const timer = setTimeout(() => timeoutOptions.reject === false ? resolve(timeoutOptions.value) : reject(err), timeout);
+        const timeoutRejections = () => {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const errorObject = err;
+            errorObject.message = `${errorObject.message} (${timeout}ms)`;
+            reject(err);
+        };
+        const timer = setTimeout(() => timeoutOptions.reject === false ? resolve(timeoutOptions.value) : timeoutRejections(), timeout);
         executor((value) => {
             clearTimeout(timer);
             resolve(value);
@@ -32,5 +118,34 @@ async function timeoutPromise(executor, timeoutOptions = {}) {
         });
     });
 }
+// Create a promise based on test timeout and the timeout options
+async function timeoutPromise(executor, timeoutOptions = {}) {
+    var _a;
+    // create the timeout error outside the async task, so its callstack includes
+    // the original call site, this makes it easier to debug
+    const err = timeoutOptions.reject === false
+        ? undefined
+        : new Error((_a = timeoutOptions.errorMsg) !== null && _a !== void 0 ? _a : "Timed out");
+    const executorPromise = getTimeoutPromise(executor, timeoutOptions, err);
+    const currentTestTimeout = TestTimeout.getInstance();
+    if (currentTestTimeout === undefined) {
+        return executorPromise;
+    }
+    return Promise.race([executorPromise, currentTestTimeout.getPromise()]).catch((e) => {
+        var _a;
+        if (e === currentTestTimeout) {
+            if (timeoutOptions.reject !== false) {
+                // If the rejection is because of the timeout then
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                const errorObject = err;
+                errorObject.message =
+                    `${(_a = timeoutOptions.errorMsg) !== null && _a !== void 0 ? _a : "Test timed out"} (${currentTestTimeout.getTimeout()}ms)`;
+                throw errorObject;
+            }
+            return timeoutOptions.value;
+        }
+        throw e;
+    });
+}
 exports.timeoutPromise = timeoutPromise;
 //# sourceMappingURL=timeoutUtils.js.map

package/dist/timeoutUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"timeoutUtils.js","sourceRoot":"","sources":["../src/timeoutUtils.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEU,QAAA,wBAAwB,GAAG,GAAG,CAAC;AAerC,KAAK,UAAU,YAAY,CAC9B,OAAuB,EACvB,iBAAyD,EAAE;IAE3D,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,cAAc,CAAI,GAAG,EAAE,GAAG,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;AACjF,CAAC;AALD,oCAKC;AAEM,KAAK,UAAU,cAAc,CAChC,QAAgG,EAChG,iBAAyD,EAAE;;IAE3D,MAAM,OAAO,GACT,cAAc,CAAC,UAAU,KAAK,SAAS;WACpC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC;WAC1C,cAAc,CAAC,UAAU,GAAG,CAAC;QAC5B,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,gCAAwB,CAAC;IAC/D,6EAA6E;IAC7E,wDAAwD;IACxD,MAAM,GAAG,GAAG,cAAc,CAAC,MAAM,KAAK,KAAK;QACvC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,MAAA,cAAc,CAAC,QAAQ,mCAAI,WAAW,IAAI,OAAO,KAAK,CAAC,CAAC;IAC3E,OAAO,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtC,MAAM,KAAK,GAAG,UAAU,CACpB,GAAG,EAAE,CAAC,cAAc,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EACnF,OAAO,CAAC,CAAC;QAEb,QAAQ,CACJ,CAAC,KAAK,EAAE,EAAE;YACN,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,OAAO,CAAC,KAAK,CAAC,CAAC;QACnB,CAAC,EACD,CAAC,MAAM,EAAE,EAAE;YACP,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,MAAM,CAAC,MAAM,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;AACP,CAAC;AA7BD,wCA6BC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nexport const defaultTimeoutDurationMs = 250;\n\nexport interface TimeoutWithError {\n    durationMs?: number;\n    reject?: true;\n    errorMsg?: string;\n}\nexport interface TimeoutWithValue<T = void> {\n    durationMs?: number;\n    reject: false;\n    value: T;\n}\n\nexport type PromiseExecutor<T = void> = (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void;\n\nexport async function timeoutAwait<T = void>(\n    promise: PromiseLike<T>,\n    timeoutOptions: TimeoutWithError | TimeoutWithValue<T> = {},\n) {\n    return Promise.race([promise, timeoutPromise<T>(() => { }, timeoutOptions)]);\n}\n\nexport async function timeoutPromise<T = void>(\n    executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void,\n    timeoutOptions: TimeoutWithError | TimeoutWithValue<T> = {},\n): Promise<T> {\n    const timeout =\n        timeoutOptions.durationMs !== undefined\n        && Number.isFinite(timeoutOptions.durationMs)\n        && timeoutOptions.durationMs > 0\n            ? timeoutOptions.durationMs : defaultTimeoutDurationMs;\n    // create the timeout error outside the async task, so its callstack includes\n    // the original call site, this makes it easier to debug\n    const err = timeoutOptions.reject === false\n        ? undefined\n        : new Error(`${timeoutOptions.errorMsg ?? \"Timed out\"}(${timeout}ms)`);\n    return new Promise<T>((resolve, reject) => {\n        const timer = setTimeout(\n            () => timeoutOptions.reject === false ? resolve(timeoutOptions.value) : reject(err),\n            timeout);\n\n        executor(\n            (value) => {\n                clearTimeout(timer);\n                resolve(value);\n            },\n            (reason) => {\n                clearTimeout(timer);\n                reject(reason);\n            });\n    });\n}\n"]}
+{"version":3,"file":"timeoutUtils.js","sourceRoot":"","sources":["../src/timeoutUtils.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { Container } from \"@fluidframework/container-loader\";\nimport { assert, Deferred } from \"@fluidframework/common-utils\";\n\n// @deprecated this value is no longer used\nexport const defaultTimeoutDurationMs = 250;\n\n// TestTimeout class manage tracking of test timeout. It create a timer when timeout is in effect,\n// and provide a promise that will be reject before the test timeout happen with a `timeBuffer` of 15 ms.\n// Once rejected, a new TestTimeout object will be create for the timeout.\n\nconst timeBuffer = 15; // leave 15 ms leeway for finish processing\n\nclass TestTimeout {\n    private timeout: number = 0;\n    private timer: NodeJS.Timeout | undefined;\n    private readonly deferred: Deferred<void>;\n    private rejected = false;\n\n    private static instance: TestTimeout = new TestTimeout();\n    public static reset(runnable: Mocha.Runnable) {\n        TestTimeout.clear();\n        TestTimeout.instance.resetTimer(runnable);\n    }\n\n    public static clear() {\n        if (TestTimeout.instance.rejected) {\n            TestTimeout.instance = new TestTimeout();\n        } else {\n            TestTimeout.instance.clearTimer();\n        }\n    }\n\n    public static getInstance() {\n        return TestTimeout.instance;\n    }\n\n    public async getPromise() {\n        return this.deferred.promise;\n    }\n\n    public getTimeout() {\n        return this.timeout;\n    }\n\n    private constructor() {\n        this.deferred = new Deferred();\n        // Ignore rejection for timeout promise if no one is waiting for it.\n        this.deferred.promise.catch(() => { });\n    }\n\n    private resetTimer(runnable: Mocha.Runnable) {\n        assert(!this.timer, \"clearTimer should have been called before reset\");\n        assert(!this.deferred.isCompleted, \"can't reset a completed TestTimeout\");\n\n        // Check the test timeout setting\n        const timeout = runnable.timeout();\n        if (!(Number.isFinite(timeout) && timeout > 0)) { return; }\n\n        // subtract a buffer\n        this.timeout = Math.max(timeout - timeBuffer, 1);\n\n        // Set up timer to reject near the test timeout.\n        this.timer = setTimeout(() => {\n            this.deferred.reject(this);\n            this.rejected = true;\n        }, this.timeout);\n    }\n    private clearTimer() {\n        if (this.timer) {\n            clearTimeout(this.timer);\n            this.timer = undefined;\n        }\n    }\n}\n\n// only register if we are running with mocha-test-setup loaded\nif (globalThis.getMochaModule !== undefined) {\n    // patching resetTimeout and clearTimeout on the runnable object\n    // so we can track when test timeout are enforced\n    const mochaModule = globalThis.getMochaModule() as typeof Mocha;\n    const runnablePrototype = mochaModule.Runnable.prototype;\n    // eslint-disable-next-line @typescript-eslint/unbound-method\n    const oldResetTimeoutFunc = runnablePrototype.resetTimeout;\n    runnablePrototype.resetTimeout = function(this: Mocha.Runnable) {\n        oldResetTimeoutFunc.call(this);\n        TestTimeout.reset(this);\n    };\n    // eslint-disable-next-line @typescript-eslint/unbound-method\n    const oldClearTimeoutFunc = runnablePrototype.clearTimeout;\n    runnablePrototype.clearTimeout = function(this: Mocha.Runnable) {\n        TestTimeout.clear();\n        oldClearTimeoutFunc.call(this);\n    };\n}\n\nexport interface TimeoutWithError {\n    /**\n     * Timeout duration in milliseconds, if it is great than 0 and not Infinity\n     * If it is undefined, then it will use test timeout if we are in side the test function\n     * Otherwise, there is no timeout\n     */\n    durationMs?: number;\n    reject?: true;\n    errorMsg?: string;\n}\nexport interface TimeoutWithValue<T = void> {\n    /**\n     * Timeout duration in milliseconds, if it is great than 0 and not Infinity\n     * If it is undefined, then it will use test timeout if we are in side the test function\n     * Otherwise, there is no timeout\n     */\n    durationMs?: number;\n    reject: false;\n    value: T;\n}\n\nexport type PromiseExecutor<T = void> = (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void;\n\nexport async function timeoutAwait<T = void>(\n    promise: PromiseLike<T>,\n    timeoutOptions: TimeoutWithError | TimeoutWithValue<T> = {},\n) {\n    return Promise.race([promise, timeoutPromise<T>(() => { }, timeoutOptions)]);\n}\n\nexport async function ensureContainerConnected(container: Container): Promise<void> {\n    if (!container.connected) {\n        return timeoutPromise((resolve) => container.once(\"connected\", () => resolve()));\n    }\n}\n\n// Create a promise based on the timeout options\nasync function getTimeoutPromise<T = void>(\n    executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void,\n    timeoutOptions: TimeoutWithError | TimeoutWithValue<T>,\n    err: Error | undefined,\n) {\n    const timeout = timeoutOptions.durationMs ?? 0;\n    if (timeout <= 0 || !Number.isFinite(timeout)) {\n        return new Promise(executor);\n    }\n\n    return new Promise<T>((resolve, reject) => {\n        const timeoutRejections = () => {\n            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n            const errorObject = err!;\n            errorObject.message = `${errorObject.message} (${timeout}ms)`;\n            reject(err);\n        };\n        const timer = setTimeout(\n            () => timeoutOptions.reject === false ? resolve(timeoutOptions.value) : timeoutRejections(),\n            timeout);\n\n        executor(\n            (value) => {\n                clearTimeout(timer);\n                resolve(value);\n            },\n            (reason) => {\n                clearTimeout(timer);\n                reject(reason);\n            });\n    });\n}\n\n// Create a promise based on test timeout and the timeout options\nexport async function timeoutPromise<T = void>(\n    executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void,\n    timeoutOptions: TimeoutWithError | TimeoutWithValue<T> = {},\n): Promise<T> {\n    // create the timeout error outside the async task, so its callstack includes\n    // the original call site, this makes it easier to debug\n    const err = timeoutOptions.reject === false\n        ? undefined\n        : new Error(timeoutOptions.errorMsg ?? \"Timed out\");\n    const executorPromise = getTimeoutPromise(executor, timeoutOptions, err);\n\n    const currentTestTimeout = TestTimeout.getInstance();\n    if (currentTestTimeout === undefined) { return executorPromise; }\n\n    return Promise.race([executorPromise, currentTestTimeout.getPromise()]).catch((e) => {\n        if (e === currentTestTimeout) {\n            if (timeoutOptions.reject !== false) {\n                // If the rejection is because of the timeout then\n                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n                const errorObject = err!;\n                errorObject.message =\n                    `${timeoutOptions.errorMsg ?? \"Test timed out\"} (${currentTestTimeout.getTimeout()}ms)`;\n                throw errorObject;\n            }\n            return timeoutOptions.value;\n        }\n        throw e;\n    }) as Promise<T>;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/test-utils",
-  "version": "2.0.0-internal.2.4.0",
+  "version": "2.0.0-internal.3.0.0",
   "description": "Utilities for Fluid tests",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -32,6 +32,9 @@
     "lint:fix": "npm run eslint:fix",
     "prettier": "prettier --check . --ignore-path ../../../.prettierignore",
     "prettier:fix": "prettier --write . --ignore-path ../../../.prettierignore",
+    "test": "npm run test:mocha",
+    "test:mocha": "mocha --unhandled-rejections=strict  --recursive dist/test/*.spec.js --exit --project src/test/tsconfig.json -r node_modules/@fluidframework/mocha-test-setup",
+    "test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
     "tsc": "tsc",
     "typetests:gen": "flub generate typetests --generate --dir .",
     "typetests:prepare": "flub generate typetests --prepare --dir . --pin"
@@ -57,28 +60,29 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluidframework/aqueduct": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0",
+    "@fluidframework/aqueduct": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^1.0.0",
-    "@fluidframework/container-definitions": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0",
-    "@fluidframework/container-loader": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0",
-    "@fluidframework/container-runtime": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0",
-    "@fluidframework/container-runtime-definitions": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0",
-    "@fluidframework/core-interfaces": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0",
-    "@fluidframework/datastore": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0",
-    "@fluidframework/datastore-definitions": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0",
-    "@fluidframework/driver-definitions": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0",
-    "@fluidframework/driver-utils": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0",
-    "@fluidframework/local-driver": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0",
-    "@fluidframework/map": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0",
+    "@fluidframework/container-definitions": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
+    "@fluidframework/container-loader": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
+    "@fluidframework/container-runtime": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
+    "@fluidframework/container-runtime-definitions": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
+    "@fluidframework/core-interfaces": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
+    "@fluidframework/datastore": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
+    "@fluidframework/datastore-definitions": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
+    "@fluidframework/driver-definitions": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
+    "@fluidframework/driver-utils": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
+    "@fluidframework/local-driver": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
+    "@fluidframework/map": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
+    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
     "@fluidframework/protocol-definitions": "^1.1.0",
-    "@fluidframework/request-handler": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0",
-    "@fluidframework/routerlicious-driver": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0",
-    "@fluidframework/runtime-definitions": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0",
-    "@fluidframework/runtime-utils": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0",
-    "@fluidframework/telemetry-utils": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0",
-    "@fluidframework/test-driver-definitions": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0",
-    "@fluidframework/test-runtime-utils": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0",
+    "@fluidframework/request-handler": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
+    "@fluidframework/routerlicious-driver": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
+    "@fluidframework/runtime-definitions": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
+    "@fluidframework/runtime-utils": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
+    "@fluidframework/telemetry-utils": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
+    "@fluidframework/test-driver-definitions": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
+    "@fluidframework/test-runtime-utils": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
     "best-random": "^1.0.0",
     "debug": "^4.1.1",
     "uuid": "^8.3.1"
@@ -98,6 +102,7 @@
     "@types/uuid": "^8.3.0",
     "concurrently": "^6.2.0",
     "copyfiles": "^2.4.1",
+    "cross-env": "^7.0.2",
     "diff": "^3.5.0",
     "eslint": "~8.6.0",
     "mocha": "^10.0.0",
@@ -108,9 +113,9 @@
     "typescript": "~4.5.5"
   },
   "typeValidation": {
-    "version": "2.0.0-internal.2.3.0",
-    "baselineRange": ">=2.0.0-internal.2.2.0 <2.0.0-internal.2.3.0",
-    "baselineVersion": "2.0.0-internal.2.2.0",
+    "version": "2.0.0-internal.3.0.0",
+    "baselineRange": ">=2.0.0-internal.2.0.0 <2.0.0-internal.3.0.0",
+    "baselineVersion": "2.0.0-internal.2.1.1",
     "broken": {}
   }
 }

package/src/TestSummaryUtils.ts

@@ -24,6 +24,7 @@ import { ITelemetryBaseLogger } from "@fluidframework/common-definitions";
 import { ITestContainerConfig, ITestObjectProvider } from "./testObjectProvider";
 import { mockConfigProvider } from "./TestConfigs";
 import { waitForContainerConnection } from "./containerUtils";
+import { timeoutAwait } from "./timeoutUtils";
 
 const summarizerClientType = "summarizer";
 
@@ -65,7 +66,6 @@ const defaultSummaryOptions: ISummaryRuntimeOptions = {
         maxAckWaitTime: 10000,
         maxOpsSinceLastSummary: 7000,
         initialSummarizerDelayMs: 0,
-        summarizerClientElection: false,
     },
 };
 
@@ -142,16 +142,16 @@ export async function createSummarizerWithContainer(
 export async function summarizeNow(summarizer: ISummarizer, reason: string = "end-to-end test") {
     const result = summarizer.summarizeOnDemand({ reason });
 
-    const submitResult = await result.summarySubmitted;
+    const submitResult = await timeoutAwait(result.summarySubmitted);
     assert(submitResult.success, "on-demand summary should submit");
     assert(submitResult.data.stage === "submit",
         "on-demand summary submitted data stage should be submit");
     assert(submitResult.data.summaryTree !== undefined, "summary tree should exist");
 
-    const broadcastResult = await result.summaryOpBroadcasted;
+    const broadcastResult = await timeoutAwait(result.summaryOpBroadcasted);
     assert(broadcastResult.success, "summary op should be broadcast");
 
-    const ackNackResult = await result.receivedSummaryAckOrNack;
+    const ackNackResult = await timeoutAwait(result.receivedSummaryAckOrNack);
     assert(ackNackResult.success, "summary op should be acked");
 
     await new Promise((resolve) => process.nextTick(resolve));

package/src/loaderContainerTracker.ts

@@ -2,8 +2,6 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-/* eslint-disable @typescript-eslint/strict-boolean-expressions */
-
 import { assert } from "@fluidframework/common-utils";
 import { IContainer, IDeltaQueue, IHostLoader } from "@fluidframework/container-definitions";
 import { Container } from "@fluidframework/container-loader";
@@ -16,9 +14,6 @@ import { timeoutAwait, timeoutPromise } from "./timeoutUtils";
 const debugOp = debug.extend("ops");
 const debugWait = debug.extend("wait");
 
-// set the maximum timeout value as 5 mins
-const defaultMaxTimeout = 5 * 6000;
-
 interface ContainerRecord {
     // A short number for debug output
     index: number;
@@ -187,7 +182,6 @@ export class LoaderContainerTracker implements IOpProcessingController {
      * - Trailing NoOp is tracked and don't count as pending ops.
      */
     private async processSynchronized(timeoutDuration: number | undefined, ...containers: IContainer[]) {
-        const start = Date.now();
         const resumed = this.resumeProcessing(...containers);
 
         let waitingSequenceNumberSynchronized = false;
@@ -214,14 +208,12 @@ export class LoaderContainerTracker implements IOpProcessingController {
                         waitingSequenceNumberSynchronized = true;
                         debugWait("Waiting for sequence number synchronized");
                         await timeoutAwait(this.waitForAnyInboundOps(containersToApply), {
-                            durationMs: timeoutDuration ? timeoutDuration - (Date.now() - start) : defaultMaxTimeout,
                             errorMsg: "Timeout on waiting for sequence number synchronized",
                         });
                     }
                 } else {
                     waitingSequenceNumberSynchronized = false;
                     await timeoutAwait(this.waitForPendingClients(pendingClients), {
-                            durationMs: timeoutDuration ? timeoutDuration - (Date.now() - start) : defaultMaxTimeout,
                         errorMsg: "Timeout on waiting for pending join or leave op",
                     });
                 }
@@ -230,12 +222,10 @@ export class LoaderContainerTracker implements IOpProcessingController {
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 debugWait(`Waiting container to be saved ${dirtyContainers.map((c) => this.containers.get(c)!.index)}`);
                 waitingSequenceNumberSynchronized = false;
-                const remainedDuration = timeoutDuration ? timeoutDuration - (Date.now() - start) : defaultMaxTimeout;
                 await Promise.all(dirtyContainers.map(async (c) => Promise.race(
                     [timeoutPromise(
                         (resolve) => c.once("saved", () => resolve()),
                         {
-                            durationMs: remainedDuration,
                             errorMsg: "Timeout on waiting a container to be saved",
                         },
                     ),
@@ -252,7 +242,6 @@ export class LoaderContainerTracker implements IOpProcessingController {
         // don't call pause if resumed is empty and pause everything, which is not what we want
         if (resumed.length !== 0) {
             await timeoutAwait(this.pauseProcessing(...resumed), {
-                durationMs: timeoutDuration ? timeoutDuration - (Date.now() - start) : defaultMaxTimeout,
                 errorMsg: "Timeout on waiting for pausing all resumed containers",
             });
         }

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/test-utils";
-export const pkgVersion = "2.0.0-internal.2.4.0";
+export const pkgVersion = "2.0.0-internal.3.0.0";

package/src/testObjectProvider.ts

@@ -149,7 +149,7 @@ export class EventAndErrorTrackingLogger extends TelemetryLogger {
     private readonly expectedEvents: ({ index: number; event: ITelemetryGenericEvent | undefined; } | undefined)[] = [];
     private readonly unexpectedErrors: ITelemetryBaseEvent[] = [];
 
-    public registerExpectedEvent(... orderedExpectedEvents: ITelemetryGenericEvent[]) {
+    public registerExpectedEvent(...orderedExpectedEvents: ITelemetryGenericEvent[]) {
         if (this.expectedEvents.length !== 0) {
             // we don't have to error here. just no reason not to. given the events must be
             // ordered it could be tricky to figure out problems around multiple registrations.
@@ -157,7 +157,7 @@ export class EventAndErrorTrackingLogger extends TelemetryLogger {
                 "Expected events already registered.\n"
                 + "Call reportAndClearTrackedEvents to clear them before registering more");
         }
-        this.expectedEvents.push(... orderedExpectedEvents.map((event, index) => ({ index, event })));
+        this.expectedEvents.push(...orderedExpectedEvents.map((event, index) => ({ index, event })));
     }
 
     send(event: ITelemetryBaseEvent): void {
@@ -232,14 +232,14 @@ export class TestObjectProvider implements ITestObjectProvider {
         if (this._logger === undefined) {
             this._logger = new EventAndErrorTrackingLogger(
                 ChildLogger.create(getTestLogger?.(), undefined,
-                {
-                    all: {
-                        driverType: this.driver.type,
-                        driverEndpointName: this.driver.endpointName,
-                        driverTenantName: this.driver.tenantName,
-                        driverUserIndex: this.driver.userIndex,
-                    },
-                }));
+                    {
+                        all: {
+                            driverType: this.driver.type,
+                            driverEndpointName: this.driver.endpointName,
+                            driverTenantName: this.driver.tenantName,
+                            driverUserIndex: this.driver.userIndex,
+                        },
+                    }));
         }
         return this._logger;
     }
@@ -293,7 +293,7 @@ export class TestObjectProvider implements ITestObjectProvider {
         }
 
         const loader = new this.LoaderConstructor({
-            ... loaderProps,
+            ...loaderProps,
             logger: multiSinkLogger,
             codeLoader: loaderProps?.codeLoader ?? new LocalCodeLoader(packageEntries),
             urlResolver: loaderProps?.urlResolver ?? this.urlResolver,
@@ -407,10 +407,9 @@ export class TestObjectProvider implements ITestObjectProvider {
     }
 
     public async ensureSynchronized(timeoutDuration?: number): Promise<void> {
-        // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
-        return !timeoutDuration
-            ? this._loaderContainerTracker.ensureSynchronized()
-            : this._loaderContainerTracker.ensureSynchronizedWithTimeout?.(timeoutDuration);
+        return this._loaderContainerTracker.ensureSynchronizedWithTimeout
+            ? this._loaderContainerTracker.ensureSynchronizedWithTimeout(timeoutDuration)
+            : this._loaderContainerTracker.ensureSynchronized();
     }
 
     public async waitContainerToCatchUp(container: IContainer) {