@fluidframework/test-utils 2.0.0-dev.3.1.0.125672 → 2.0.0-dev.4.1.0.148229

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/test-utils",
-  "version": "2.0.0-dev.3.1.0.125672",
+  "version": "2.0.0-dev.4.1.0.148229",
   "description": "Utilities for Fluid tests",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -14,31 +14,6 @@
   "main": "dist/index.js",
   "module": "lib/index.js",
   "types": "dist/index.d.ts",
-  "scripts": {
-    "build": "npm run build:genver && concurrently npm:build:compile npm:lint && npm run build:docs",
-    "build:compile": "npm run tsc && npm run typetests:gen && npm run build:test",
-    "build:compile:min": "npm run build:compile",
-    "build:docs": "api-extractor run --local --typescript-compiler-folder ../../../node_modules/typescript && copyfiles -u 1 ./_api-extractor-temp/doc-models/* ../../../_api-extractor-temp/",
-    "build:full": "npm run build",
-    "build:full:compile": "npm run build:compile",
-    "build:genver": "gen-version",
-    "build:test": "tsc --project ./src/test/tsconfig.json",
-    "ci:build:docs": "api-extractor run --typescript-compiler-folder ../../../node_modules/typescript && copyfiles -u 1 ./_api-extractor-temp/* ../../../_api-extractor-temp/",
-    "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
-    "eslint": "eslint --format stylish src",
-    "eslint:fix": "eslint --format stylish src --fix --fix-type problem,suggestion,layout",
-    "format": "npm run prettier:fix",
-    "lint": "npm run prettier && npm run eslint",
-    "lint:fix": "npm run prettier: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"
-  },
   "nyc": {
     "all": true,
     "cache-dir": "nyc/.cache",
@@ -60,64 +35,88 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluidframework/aqueduct": ">=2.0.0-dev.3.1.0.125672 <2.0.0-dev.4.0.0",
+    "@fluidframework/aqueduct": "2.0.0-dev.4.1.0.148229",
     "@fluidframework/common-definitions": "^0.20.1",
-    "@fluidframework/common-utils": "^1.0.0",
-    "@fluidframework/container-definitions": ">=2.0.0-dev.3.1.0.125672 <2.0.0-dev.4.0.0",
-    "@fluidframework/container-loader": ">=2.0.0-dev.3.1.0.125672 <2.0.0-dev.4.0.0",
-    "@fluidframework/container-runtime": ">=2.0.0-dev.3.1.0.125672 <2.0.0-dev.4.0.0",
-    "@fluidframework/container-runtime-definitions": ">=2.0.0-dev.3.1.0.125672 <2.0.0-dev.4.0.0",
-    "@fluidframework/core-interfaces": ">=2.0.0-dev.3.1.0.125672 <2.0.0-dev.4.0.0",
-    "@fluidframework/datastore": ">=2.0.0-dev.3.1.0.125672 <2.0.0-dev.4.0.0",
-    "@fluidframework/datastore-definitions": ">=2.0.0-dev.3.1.0.125672 <2.0.0-dev.4.0.0",
-    "@fluidframework/driver-definitions": ">=2.0.0-dev.3.1.0.125672 <2.0.0-dev.4.0.0",
-    "@fluidframework/driver-utils": ">=2.0.0-dev.3.1.0.125672 <2.0.0-dev.4.0.0",
-    "@fluidframework/local-driver": ">=2.0.0-dev.3.1.0.125672 <2.0.0-dev.4.0.0",
-    "@fluidframework/map": ">=2.0.0-dev.3.1.0.125672 <2.0.0-dev.4.0.0",
-    "@fluidframework/mocha-test-setup": ">=2.0.0-dev.3.1.0.125672 <2.0.0-dev.4.0.0",
+    "@fluidframework/common-utils": "^1.1.1",
+    "@fluidframework/container-definitions": "2.0.0-dev.4.1.0.148229",
+    "@fluidframework/container-loader": "2.0.0-dev.4.1.0.148229",
+    "@fluidframework/container-runtime": "2.0.0-dev.4.1.0.148229",
+    "@fluidframework/container-runtime-definitions": "2.0.0-dev.4.1.0.148229",
+    "@fluidframework/core-interfaces": "2.0.0-dev.4.1.0.148229",
+    "@fluidframework/datastore": "2.0.0-dev.4.1.0.148229",
+    "@fluidframework/datastore-definitions": "2.0.0-dev.4.1.0.148229",
+    "@fluidframework/driver-definitions": "2.0.0-dev.4.1.0.148229",
+    "@fluidframework/driver-utils": "2.0.0-dev.4.1.0.148229",
+    "@fluidframework/local-driver": "2.0.0-dev.4.1.0.148229",
+    "@fluidframework/map": "2.0.0-dev.4.1.0.148229",
     "@fluidframework/protocol-definitions": "^1.1.0",
-    "@fluidframework/request-handler": ">=2.0.0-dev.3.1.0.125672 <2.0.0-dev.4.0.0",
-    "@fluidframework/routerlicious-driver": ">=2.0.0-dev.3.1.0.125672 <2.0.0-dev.4.0.0",
-    "@fluidframework/runtime-definitions": ">=2.0.0-dev.3.1.0.125672 <2.0.0-dev.4.0.0",
-    "@fluidframework/runtime-utils": ">=2.0.0-dev.3.1.0.125672 <2.0.0-dev.4.0.0",
-    "@fluidframework/telemetry-utils": ">=2.0.0-dev.3.1.0.125672 <2.0.0-dev.4.0.0",
-    "@fluidframework/test-driver-definitions": ">=2.0.0-dev.3.1.0.125672 <2.0.0-dev.4.0.0",
-    "@fluidframework/test-runtime-utils": ">=2.0.0-dev.3.1.0.125672 <2.0.0-dev.4.0.0",
+    "@fluidframework/request-handler": "2.0.0-dev.4.1.0.148229",
+    "@fluidframework/routerlicious-driver": "2.0.0-dev.4.1.0.148229",
+    "@fluidframework/runtime-definitions": "2.0.0-dev.4.1.0.148229",
+    "@fluidframework/runtime-utils": "2.0.0-dev.4.1.0.148229",
+    "@fluidframework/telemetry-utils": "2.0.0-dev.4.1.0.148229",
+    "@fluidframework/test-driver-definitions": "2.0.0-dev.4.1.0.148229",
+    "@fluidframework/test-runtime-utils": "2.0.0-dev.4.1.0.148229",
     "best-random": "^1.0.0",
     "debug": "^4.1.1",
     "uuid": "^8.3.1"
   },
   "devDependencies": {
-    "@fluid-tools/build-cli": "^0.8.0",
+    "@fluid-tools/build-cli": "^0.13.1",
     "@fluidframework/build-common": "^1.1.0",
-    "@fluidframework/build-tools": "^0.8.0",
+    "@fluidframework/build-tools": "^0.13.1",
     "@fluidframework/eslint-config-fluid": "^2.0.0",
-    "@fluidframework/test-utils-previous": "npm:@fluidframework/test-utils@2.0.0-internal.3.0.0",
-    "@microsoft/api-extractor": "^7.22.2",
-    "@rushstack/eslint-config": "^2.5.1",
+    "@fluidframework/mocha-test-setup": "2.0.0-dev.4.1.0.148229",
+    "@fluidframework/test-utils-previous": "npm:@fluidframework/test-utils@2.0.0-internal.4.0.0",
+    "@microsoft/api-extractor": "^7.34.4",
     "@types/debug": "^4.1.5",
     "@types/diff": "^3.5.1",
     "@types/mocha": "^9.1.1",
-    "@types/node": "^14.18.36",
+    "@types/node": "^14.18.38",
     "@types/random-js": "^1.0.31",
     "@types/uuid": "^8.3.0",
-    "concurrently": "^6.2.0",
+    "concurrently": "^7.6.0",
     "copyfiles": "^2.4.1",
-    "cross-env": "^7.0.2",
+    "cross-env": "^7.0.3",
     "diff": "^3.5.0",
     "eslint": "~8.6.0",
-    "mocha": "^10.0.0",
-    "nyc": "^15.0.0",
+    "mocha": "^10.2.0",
+    "mocha-json-output-reporter": "^2.0.1",
+    "mocha-multi-reporters": "^1.5.1",
+    "moment": "^2.21.0",
+    "nyc": "^15.1.0",
     "prettier": "~2.6.2",
     "random-js": "^1.0.8",
-    "rimraf": "^2.6.2",
+    "rimraf": "^4.4.0",
     "typescript": "~4.5.5"
   },
   "typeValidation": {
-    "version": "2.0.0-internal.3.1.0",
-    "previousVersionStyle": "~previousMinor",
-    "baselineRange": ">=2.0.0-internal.3.0.0 <2.0.0-internal.3.1.0",
-    "baselineVersion": "2.0.0-internal.3.0.0",
     "broken": {}
+  },
+  "scripts": {
+    "build": "npm run build:genver && concurrently npm:build:compile npm:lint && npm run build:docs",
+    "build:compile": "npm run tsc && npm run typetests:gen && npm run build:test",
+    "build:compile:min": "npm run build:compile",
+    "build:docs": "api-extractor run --local --typescript-compiler-folder ../../../node_modules/typescript && copyfiles -u 1 ./_api-extractor-temp/doc-models/* ../../../_api-extractor-temp/",
+    "build:full": "npm run build",
+    "build:full:compile": "npm run build:compile",
+    "build:genver": "gen-version",
+    "build:test": "tsc --project ./src/test/tsconfig.json",
+    "ci:build:docs": "api-extractor run --typescript-compiler-folder ../../../node_modules/typescript && copyfiles -u 1 ./_api-extractor-temp/* ../../../_api-extractor-temp/",
+    "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
+    "eslint": "eslint --format stylish src",
+    "eslint:fix": "eslint --format stylish src --fix --fix-type problem,suggestion,layout",
+    "format": "npm run prettier:fix",
+    "lint": "npm run prettier && npm run eslint",
+    "lint:fix": "npm run prettier: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:multireport": "cross-env FLUID_TEST_MULTIREPORT=1 npm run test:mocha",
+    "test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
+    "tsc": "tsc",
+    "typetests:gen": "fluid-type-test-generator",
+    "typetests:prepare": "flub generate typetests --prepare --dir . --pin"
   }
-}
+}

package/src/TestConfigs.ts

@@ -8,8 +8,6 @@ import { ConfigTypes, IConfigProviderBase } from "@fluidframework/telemetry-util
 export const mockConfigProvider = (
 	settings: Record<string, ConfigTypes> = {},
 ): IConfigProviderBase => {
-	settings["Fluid.GarbageCollection.TrackGCState"] = "true";
-	settings["Fluid.GarbageCollection.WriteDataAtRoot"] = "true";
 	return {
 		getRawConfig: (name: string): ConfigTypes => settings[name],
 	};

package/src/TestSummaryUtils.ts

@@ -29,10 +29,11 @@ import { timeoutAwait } from "./timeoutUtils";
 const summarizerClientType = "summarizer";
 
 async function createSummarizerCore(
-	absoluteUrl: string | undefined,
+	container: IContainer,
 	loader: IHostLoader,
 	summaryVersion?: string,
 ) {
+	const absoluteUrl = await container.getAbsoluteUrl("");
 	if (absoluteUrl === undefined) {
 		throw new Error("URL could not be resolved");
 	}
@@ -52,10 +53,12 @@ async function createSummarizerCore(
 	const summarizerContainer = await loader.resolve(request);
 	await waitForContainerConnection(summarizerContainer);
 
-	const fluidObject = await requestFluidObject<FluidObject<ISummarizer>>(summarizerContainer, {
-		url: "_summarizer",
-	});
-	if (fluidObject.ISummarizer === undefined) {
+	const fluidObject: FluidObject<ISummarizer> | undefined = summarizerContainer.getEntryPoint
+		? await summarizerContainer.getEntryPoint?.()
+		: await requestFluidObject<FluidObject<ISummarizer>>(summarizerContainer, {
+				url: "_summarizer",
+		  });
+	if (fluidObject?.ISummarizer === undefined) {
 		throw new Error("Fluid object does not implement ISummarizer");
 	}
 
@@ -74,6 +77,11 @@ const defaultSummaryOptions: ISummaryRuntimeOptions = {
 	},
 };
 
+/**
+ * Creates a summarizer client from the given container and data store factory, and returns the summarizer client's
+ * IContainer and ISummarizer.
+ * The ISummarizer can be used to generate on-demand summaries. The IContainer can be used to fetch data stores, etc.
+ */
 export async function createSummarizerFromFactory(
 	provider: ITestObjectProvider,
 	container: IContainer,
@@ -81,7 +89,8 @@ export async function createSummarizerFromFactory(
 	summaryVersion?: string,
 	containerRuntimeFactoryType = ContainerRuntimeFactoryWithDefaultDataStore,
 	registryEntries?: NamedFluidDataStoreRegistryEntries,
-): Promise<ISummarizer> {
+	logger?: ITelemetryBaseLogger,
+): Promise<{ container: IContainer; summarizer: ISummarizer }> {
 	const innerRequestHandler = async (request: IRequest, runtime: IContainerRuntimeBase) =>
 		runtime.IFluidHandleContext.resolveHandle(request);
 	const runtimeFactory = new containerRuntimeFactoryType(
@@ -94,11 +103,15 @@ export async function createSummarizerFromFactory(
 
 	const loader = provider.createLoader([[provider.defaultCodeDetails, runtimeFactory]], {
 		configProvider: mockConfigProvider(),
+		logger,
 	});
-	const absoluteUrl = await container.getAbsoluteUrl("");
-	return (await createSummarizerCore(absoluteUrl, loader, summaryVersion)).summarizer;
+	return createSummarizerCore(container, loader, summaryVersion);
 }
 
+/**
+ * Creates a summarizer client from the given container and returns the summarizer client's IContainer and ISummarizer.
+ * The ISummarizer can be used to generate on-demand summaries. The IContainer can be used to fetch data stores, etc.
+ */
 export async function createSummarizer(
 	provider: ITestObjectProvider,
 	container: IContainer,
@@ -106,27 +119,6 @@ export async function createSummarizer(
 	gcOptions?: IGCRuntimeOptions,
 	configProvider: IConfigProviderBase = mockConfigProvider(),
 	logger?: ITelemetryBaseLogger,
-): Promise<ISummarizer> {
-	const absoluteUrl = await container.getAbsoluteUrl("");
-	return (
-		await createSummarizerWithContainer(
-			provider,
-			absoluteUrl,
-			summaryVersion,
-			gcOptions,
-			configProvider,
-			logger,
-		)
-	).summarizer;
-}
-
-export async function createSummarizerWithContainer(
-	provider: ITestObjectProvider,
-	absoluteUrl: string | undefined,
-	summaryVersion?: string,
-	gcOptions?: IGCRuntimeOptions,
-	configProvider: IConfigProviderBase = mockConfigProvider(),
-	logger?: ITelemetryBaseLogger,
 ): Promise<{ container: IContainer; summarizer: ISummarizer }> {
 	const testContainerConfig: ITestContainerConfig = {
 		runtimeOptions: {
@@ -136,8 +128,9 @@ export async function createSummarizerWithContainer(
 		loaderProps: { configProvider, logger },
 	};
 	const loader = provider.makeTestLoader(testContainerConfig);
-	return createSummarizerCore(absoluteUrl, loader, summaryVersion);
+	return createSummarizerCore(container, loader, summaryVersion);
 }
+
 /**
  * Summarizes on demand and returns the summary tree, the version number and the reference sequence number of the
  * submitted summary.

package/src/containerUtils.ts

@@ -4,23 +4,9 @@
  */
 
 import { IContainer } from "@fluidframework/container-definitions";
-import { ConnectionState, Container } from "@fluidframework/container-loader";
+import { ConnectionState } from "@fluidframework/container-loader";
 import { PromiseExecutor, timeoutPromise, TimeoutWithError } from "./timeoutUtils";
 
-/**
- * Waits for the specified container to emit a 'connected' event.
- *
- * @deprecated Use waitForContainerConnection instead.
- * Note that an upcoming release will change the default parameters on that function to:
- * - failOnContainerClose = true
- * - timeoutOptions.durationMs = 1s
- */
-export async function ensureContainerConnected(container: Container): Promise<void> {
-	if (!container.connected) {
-		return timeoutPromise((resolve) => container.once("connected", () => resolve()));
-	}
-}
-
 /**
  * Utility function to wait for the specified Container to be in Connected state.
  * If the Container is already connected, the Promise returns immediately; otherwise it resolves when the Container emits
@@ -30,20 +16,21 @@ export async function ensureContainerConnected(container: Container): Promise<vo
  * @param container - The container to wait for.
  * @param failOnContainerClose - If true, the returned Promise will be rejected if the container emits a 'closed' event
  * before a 'connected' event.
- * Defaults to false (but this will change in an upcoming version).
+ * Defaults to true.
  * @param timeoutOptions - Options related to the behavior of the timeout.
- * If not provided, no timeout will be applied and the promise will wait indefinitely for the Container to emit its
- * 'connected' (or 'closed, if failOnContainerClose === true) event.
- * @returns A Promise that resolves when the specified container emits a 'connected' event (or immediately if the
- * Container is already connected).
- * If failOnContainerClose === true and the container emits a 'closed' event before a 'connected' event, the Promise
- * is rejected with the error from the 'closed' event, if any.
- * If timeoutOptions is provided, the Promise will reject if the container hasn't emmited a relevant event before
- * timeoutOptions.durationMs (which defaults to 250ms if left undefined).
+ * If provided, the returned Promise will reject if the container hasn't emitted relevant events in timeoutOptions.durationMs.
+ * If not provided, the Promise will wait indefinitely for the Container to emit its 'connected' (or 'closed', if
+ * failOnContainerClose === true) event.
+ *
+ * @returns A Promise that either:
+ * - Resolves when the specified container emits a 'connected' event (or immediately if the Container is already connected).
+ * - Rejects if failOnContainerClose === true and the container emits a 'closed' event before a 'connected' event.
+ * - Rejects after timeoutOptions.durationMs if timeoutOptions !== undefined and the container does not emit relevant
+ * events, within that timeframe.
  */
 export async function waitForContainerConnection(
 	container: IContainer,
-	failOnContainerClose: boolean = false,
+	failOnContainerClose: boolean = true,
 	timeoutOptions?: TimeoutWithError,
 ): Promise<void> {
 	if (container.connectionState !== ConnectionState.Connected) {

package/src/index.ts

@@ -29,12 +29,7 @@ export {
 	ITestObjectProvider,
 	TestObjectProvider,
 } from "./testObjectProvider";
-export {
-	createSummarizer,
-	createSummarizerFromFactory,
-	createSummarizerWithContainer,
-	summarizeNow,
-} from "./TestSummaryUtils";
+export { createSummarizer, createSummarizerFromFactory, summarizeNow } from "./TestSummaryUtils";
 export {
 	defaultTimeoutDurationMs,
 	timeoutAwait,
@@ -42,4 +37,4 @@ export {
 	TimeoutWithError,
 	TimeoutWithValue,
 } from "./timeoutUtils";
-export { ensureContainerConnected, waitForContainerConnection } from "./containerUtils";
+export { waitForContainerConnection } from "./containerUtils";

package/src/loaderContainerTracker.ts

@@ -4,7 +4,7 @@
  */
 import { assert } from "@fluidframework/common-utils";
 import { IContainer, IDeltaQueue, IHostLoader } from "@fluidframework/container-definitions";
-import { Container } from "@fluidframework/container-loader";
+import { ConnectionState } from "@fluidframework/container-loader";
 import { canBeCoalescedByService } from "@fluidframework/driver-utils";
 import {
 	IDocumentMessage,
@@ -123,7 +123,7 @@ export class LoaderContainerTracker implements IOpProcessingController {
 			// Received the no op back, update the record if we are tracking
 			if (
 				canBeCoalescedByService(message) &&
-				message.clientId === (container as Container).clientId &&
+				message.clientId === container.clientId &&
 				record.trailingNoOps !== 0 &&
 				record.startTrailingNoOps <= message.clientSequenceNumber
 			) {
@@ -162,21 +162,16 @@ export class LoaderContainerTracker implements IOpProcessingController {
 		// REVIEW: do we need to unpatch the loaders?
 	}
 
-	/**
-	 * Ensure all tracked containers are synchronized
-	 */
-	public async ensureSynchronized(...containers: IContainer[]): Promise<void> {
-		await this.processSynchronized(undefined, ...containers);
-	}
-
 	/**
 	 * Ensure all tracked containers are synchronized with a time limit
+	 *
+	 * @deprecated - this method is equivalent to @see {@link LoaderContainerTracker.ensureSynchronized}, please configure the test timeout instead
 	 */
 	public async ensureSynchronizedWithTimeout?(
 		timeoutDuration: number | undefined,
 		...containers: IContainer[]
 	) {
-		await this.processSynchronized(timeoutDuration, ...containers);
+		await this.ensureSynchronized(...containers);
 	}
 
 	/**
@@ -198,10 +193,7 @@ export class LoaderContainerTracker implements IOpProcessingController {
 	 *
 	 * - Trailing NoOp is tracked and don't count as pending ops.
 	 */
-	private async processSynchronized(
-		timeoutDuration: number | undefined,
-		...containers: IContainer[]
-	) {
+	public async ensureSynchronized(...containers: IContainer[]): Promise<void> {
 		const resumed = this.resumeProcessing(...containers);
 
 		let waitingSequenceNumberSynchronized = false;
@@ -287,9 +279,7 @@ export class LoaderContainerTracker implements IOpProcessingController {
 		// All the clientId we track should be a superset of the quorum, otherwise, we are missing
 		// leave messages
 		const openedDocuments = Array.from(this.containers.keys()).filter((c) => !c.closed);
-		const openedClientId = openedDocuments.map(
-			(container) => (container as Container).clientId,
-		);
+		const openedClientId = openedDocuments.map((container) => container.clientId);
 
 		const pendingClients: [IContainer, Set<string>][] = [];
 		containersToApply.forEach((container) => {
@@ -375,7 +365,7 @@ export class LoaderContainerTracker implements IOpProcessingController {
 	 */
 	private async waitForPendingClients(pendingClients: [IContainer, Set<string>][]) {
 		const unconnectedClients = Array.from(this.containers.keys()).filter(
-			(c) => !c.closed && !(c as Container).connected,
+			(c) => !c.closed && c.connectionState !== ConnectionState.Connected,
 		);
 		return Promise.all(
 			pendingClients.map(async ([container, pendingClientId]) => {
@@ -546,7 +536,7 @@ export class LoaderContainerTracker implements IOpProcessingController {
 		const inHandler = (message: ISequencedDocumentMessage) => {
 			if (
 				!canBeCoalescedByService(message) &&
-				message.clientId === (container as Container).clientId &&
+				message.clientId === container.clientId &&
 				inflightTracker.get(container) === message.clientSequenceNumber
 			) {
 				inflightTracker.delete(container);
@@ -600,7 +590,7 @@ export class LoaderContainerTracker implements IOpProcessingController {
 					return `${e.message}: ${e.stack}`;
 				}
 			};
-			debugOp(`${index}: ADD: clientId: ${(container as Container).clientId}`);
+			debugOp(`${index}: ADD: clientId: ${container.clientId}`);
 			container.deltaManager.outbound.on("op", (messages) => {
 				for (const msg of messages) {
 					debugOp(
@@ -614,7 +604,7 @@ export class LoaderContainerTracker implements IOpProcessingController {
 			const getInboundHandler = (type: string) => {
 				return (msg: ISequencedDocumentMessage) => {
 					const clientSeq =
-						msg.clientId === (container as Container).clientId
+						msg.clientId === container.clientId
 							? `cli: ${msg.clientSequenceNumber.toString().padStart(3)}`
 							: "        ";
 					debugOp(

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/test-utils";
-export const pkgVersion = "2.0.0-dev.3.1.0.125672";
+export const pkgVersion = "2.0.0-dev.4.1.0.148229";

package/src/testObjectProvider.ts

@@ -3,7 +3,12 @@
  * Licensed under the MIT License.
  */
 
-import { IContainer, IHostLoader, IFluidCodeDetails } from "@fluidframework/container-definitions";
+import {
+	IContainer,
+	IHostLoader,
+	IFluidCodeDetails,
+	LoaderHeader,
+} from "@fluidframework/container-definitions";
 import {
 	ITelemetryGenericEvent,
 	ITelemetryBaseLogger,
@@ -154,10 +159,18 @@ function getDocumentIdStrategy(type?: TestDriverTypes): IDocumentIdStrategy {
  * any expected events that have not occurred.
  */
 export class EventAndErrorTrackingLogger extends TelemetryLogger {
-	/** Even if these error events are logged, tests should still be allowed to pass */
-	private readonly allowedErrors: string[] = [
+	/**
+	 * Even if these error events are logged, tests should still be allowed to pass
+	 * Additionally, if downgrade is true, then log as generic (e.g. to avoid polluting the e2e test logs)
+	 */
+	private readonly allowedErrors: { eventName: string; downgrade?: true }[] = [
 		// This log was removed in current version as unnecessary, but it's still present in previous versions
-		"fluid:telemetry:Container:NoRealStorageInDetachedContainer",
+		{
+			eventName: "fluid:telemetry:Container:NoRealStorageInDetachedContainer",
+			downgrade: true,
+		},
+		// This log's category changes depending on the op latency. test results shouldn't be affected but if we see lots we'd like an alert from the logs.
+		{ eventName: "fluid:telemetry:OpPerf:OpRoundtripTime" },
 	];
 
 	constructor(private readonly baseLogger: ITelemetryBaseLogger) {
@@ -207,10 +220,15 @@ export class EventAndErrorTrackingLogger extends TelemetryLogger {
 			}
 		}
 		if (event.category === "error") {
-			if (this.allowedErrors.includes(event.eventName)) {
-				event.category = "generic";
-			} else {
+			// Check to see if this error is allowed and if its category should be downgraded
+			const allowedError = this.allowedErrors.find(
+				({ eventName }) => eventName === event.eventName,
+			);
+
+			if (allowedError === undefined) {
 				this.unexpectedErrors.push(event);
+			} else if (allowedError.downgrade) {
+				event.category = "generic";
 			}
 		}
 
@@ -364,10 +382,37 @@ export class TestObjectProvider implements ITestObjectProvider {
 		requestHeader?: IRequestHeader,
 	): Promise<IContainer> {
 		const loader = this.createLoader([[defaultCodeDetails, entryPoint]], loaderProps);
-		return loader.resolve({
+
+		// Once ADO#3889 is done to switch default connection mode to "read" on load, we don't need
+		// to load "delayed" across the board. Remove the following code.
+		const delayConnection =
+			requestHeader === undefined || requestHeader[LoaderHeader.reconnect] !== false;
+		const headers: IRequestHeader = delayConnection
+			? {
+					[LoaderHeader.loadMode]: { deltaConnection: "delayed" },
+					...requestHeader,
+			  }
+			: requestHeader;
+
+		const container = await loader.resolve({
 			url: await this.driver.createContainerUrl(this.documentId),
-			headers: requestHeader,
+			headers,
 		});
+
+		// Once ADO#3889 is done to switch default connection mode to "read" on load, we don't need
+		// to load "delayed" across the board. Remove the following code.
+		if (delayConnection) {
+			// Older version may not have connect, use resume instead.
+			const maybeContainer = container as Partial<IContainer>;
+			if (maybeContainer.connect !== undefined) {
+				container.connect();
+			} else {
+				// back compat
+				(container as any).resume();
+			}
+		}
+
+		return container;
 	}
 
 	/**
@@ -442,9 +487,7 @@ export class TestObjectProvider implements ITestObjectProvider {
 	}
 
 	public async ensureSynchronized(timeoutDuration?: number): Promise<void> {
-		return this._loaderContainerTracker.ensureSynchronizedWithTimeout
-			? this._loaderContainerTracker.ensureSynchronizedWithTimeout(timeoutDuration)
-			: this._loaderContainerTracker.ensureSynchronized();
+		return this._loaderContainerTracker.ensureSynchronized();
 	}
 
 	public async waitContainerToCatchUp(container: IContainer) {

package/src/timeoutUtils.ts

@@ -3,7 +3,6 @@
  * Licensed under the MIT License.
  */
 
-import { Container } from "@fluidframework/container-loader";
 import { assert, Deferred } from "@fluidframework/common-utils";
 
 // @deprecated this value is no longer used
@@ -133,12 +132,6 @@ export async function timeoutAwait<T = void>(
 	return Promise.race([promise, timeoutPromise<T>(() => {}, timeoutOptions)]);
 }
 
-export async function ensureContainerConnected(container: Container): Promise<void> {
-	if (!container.connected) {
-		return timeoutPromise((resolve) => container.once("connected", () => resolve()));
-	}
-}
-
 // Create a promise based on the timeout options
 async function getTimeoutPromise<T = void>(
 	executor: (