@fluidframework/test-utils 2.41.0-338401 → 2.41.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/test-utils",
-  "version": "2.41.0-338401",
+  "version": "2.41.0",
   "description": "Utilities for Fluid tests",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -67,26 +67,26 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/test-driver-definitions": "2.41.0-338401",
-    "@fluidframework/container-definitions": "2.41.0-338401",
-    "@fluidframework/container-loader": "2.41.0-338401",
-    "@fluidframework/container-runtime": "2.41.0-338401",
-    "@fluidframework/container-runtime-definitions": "2.41.0-338401",
-    "@fluidframework/core-interfaces": "2.41.0-338401",
-    "@fluidframework/core-utils": "2.41.0-338401",
-    "@fluidframework/datastore": "2.41.0-338401",
-    "@fluidframework/datastore-definitions": "2.41.0-338401",
-    "@fluidframework/driver-definitions": "2.41.0-338401",
-    "@fluidframework/driver-utils": "2.41.0-338401",
-    "@fluidframework/local-driver": "2.41.0-338401",
-    "@fluidframework/map": "2.41.0-338401",
-    "@fluidframework/odsp-driver": "2.41.0-338401",
-    "@fluidframework/request-handler": "2.41.0-338401",
-    "@fluidframework/routerlicious-driver": "2.41.0-338401",
-    "@fluidframework/runtime-definitions": "2.41.0-338401",
-    "@fluidframework/runtime-utils": "2.41.0-338401",
-    "@fluidframework/shared-object-base": "2.41.0-338401",
-    "@fluidframework/telemetry-utils": "2.41.0-338401",
+    "@fluid-internal/test-driver-definitions": "~2.41.0",
+    "@fluidframework/container-definitions": "~2.41.0",
+    "@fluidframework/container-loader": "~2.41.0",
+    "@fluidframework/container-runtime": "~2.41.0",
+    "@fluidframework/container-runtime-definitions": "~2.41.0",
+    "@fluidframework/core-interfaces": "~2.41.0",
+    "@fluidframework/core-utils": "~2.41.0",
+    "@fluidframework/datastore": "~2.41.0",
+    "@fluidframework/datastore-definitions": "~2.41.0",
+    "@fluidframework/driver-definitions": "~2.41.0",
+    "@fluidframework/driver-utils": "~2.41.0",
+    "@fluidframework/local-driver": "~2.41.0",
+    "@fluidframework/map": "~2.41.0",
+    "@fluidframework/odsp-driver": "~2.41.0",
+    "@fluidframework/request-handler": "~2.41.0",
+    "@fluidframework/routerlicious-driver": "~2.41.0",
+    "@fluidframework/runtime-definitions": "~2.41.0",
+    "@fluidframework/runtime-utils": "~2.41.0",
+    "@fluidframework/shared-object-base": "~2.41.0",
+    "@fluidframework/telemetry-utils": "~2.41.0",
     "best-random": "^1.0.0",
     "debug": "^4.3.4",
     "mocha": "^10.8.2",
@@ -95,11 +95,11 @@
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.17.1",
     "@biomejs/biome": "~1.9.3",
-    "@fluid-internal/mocha-test-setup": "2.41.0-338401",
+    "@fluid-internal/mocha-test-setup": "~2.41.0",
     "@fluid-tools/build-cli": "^0.55.0",
     "@fluidframework/build-common": "^2.0.3",
     "@fluidframework/build-tools": "^0.55.0",
-    "@fluidframework/eslint-config-fluid": "^5.7.3",
+    "@fluidframework/eslint-config-fluid": "^5.7.4",
     "@fluidframework/test-utils-previous": "npm:@fluidframework/test-utils@2.40.0",
     "@microsoft/api-extractor": "7.52.8",
     "@types/debug": "^4.1.5",

package/src/TestSummaryUtils.ts

@@ -51,7 +51,7 @@ async function getSummarizerBackCompat(container: IContainer): Promise<ISummariz
 	if (container.getEntryPoint !== undefined) {
 		const entryPoint = await container.getEntryPoint();
 		// Note: We need to also check if the result of `getEntryPoint()` is defined. This is because when running
-		// cross version compat testing scenarios, if we create with 1.X container and load with 2.X then the
+		// cross-client compat testing scenarios, if we create with 1.X container and load with 2.X then the
 		// function container.getEntryPoint will be defined for the 2.X container. However, it will not return undefined
 		// since the container's runtime will be on version 1.X, which does not have an entry point defined.
 		if (entryPoint !== undefined) {

package/src/containerUtils.ts

@@ -71,7 +71,7 @@ export async function getContainerEntryPointBackCompat<T>(container: IContainer)
 	if (container.getEntryPoint !== undefined) {
 		const entryPoint = await container.getEntryPoint();
 		// Note: We need to also check if the result of `getEntryPoint()` is defined. This is because when running
-		// cross version compat testing scenarios, if we create with 1.X container and load with 2.X then the
+		// cross-client compat testing scenarios, if we create with 1.X container and load with 2.X then the
 		// function container.getEntryPoint will be defined for the 2.X container. However, it will not return undefined
 		// since the container's runtime will be on version 1.X, which does not have an entry point defined.
 		if (entryPoint !== undefined) {

package/src/loaderContainerTracker.ts

@@ -200,6 +200,9 @@ export class LoaderContainerTracker implements IOpProcessingController {
 		this.lastProposalSeqNum = 0;
 		for (const container of this.containers.keys()) {
 			container.close();
+			// Optional chaining here is because containers made with LTS loaders don't have a dispose method or process
+			// and this package is used with various previous versions of Fluid layers in our compat testing.
+			container.dispose?.();
 		}
 		this.containers.clear();
 

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/test-utils";
-export const pkgVersion = "2.41.0-338401";
+export const pkgVersion = "2.41.0";

package/src/timeoutUtils.ts

@@ -19,17 +19,14 @@ class TestTimeout {
 	private deferred: Deferred<void> = new Deferred<void>();
 
 	private static instance: TestTimeout = new TestTimeout();
-	public static reset(runnable: Mocha.Runnable) {
-		TestTimeout.clear();
+	public static updateOnYield(runnable: Mocha.Runnable) {
+		TestTimeout.instance.clearTimer();
 		TestTimeout.instance.resetTimer(runnable);
 	}
 
-	public static clear() {
-		if (TestTimeout.instance.deferred.isCompleted) {
-			TestTimeout.instance = new TestTimeout();
-		} else {
-			TestTimeout.instance.clearTimer();
-		}
+	public static reset() {
+		TestTimeout.instance.clearTimer();
+		TestTimeout.instance = new TestTimeout();
 	}
 
 	public static getInstance() {
@@ -83,14 +80,25 @@ if (globalThis.getMochaModule !== undefined) {
 	const runnablePrototype = mochaModule.Runnable.prototype;
 	// eslint-disable-next-line @typescript-eslint/unbound-method
 	const oldResetTimeoutFunc = runnablePrototype.resetTimeout;
+	let resetTimeoutCallDepth = 0;
+	// Mocha invokes resetTimeout after each async yield a test performs.
 	runnablePrototype.resetTimeout = function (this: Mocha.Runnable) {
-		oldResetTimeoutFunc.call(this);
-		TestTimeout.reset(this);
+		resetTimeoutCallDepth++;
+		try {
+			oldResetTimeoutFunc.call(this);
+		} finally {
+			resetTimeoutCallDepth--;
+		}
+		TestTimeout.updateOnYield(this);
 	};
 	// eslint-disable-next-line @typescript-eslint/unbound-method
 	const oldClearTimeoutFunc = runnablePrototype.clearTimeout;
 	runnablePrototype.clearTimeout = function (this: Mocha.Runnable) {
-		TestTimeout.clear();
+		if (resetTimeoutCallDepth === 0) {
+			// Mocha's runnable invokes clearTimeout as part of its resetTimeout as well as at the end of Runnables.
+			// We only want to fully reset the TestTimeout instance at the end of each runnable, not on JS turn boundaries.
+			TestTimeout.reset();
+		}
 		oldClearTimeoutFunc.call(this);
 	};
 }