From 4c7cb34ef369dbac5910b252dbd9ea933c17858a Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Mon, 3 Aug 2026 19:11:11 +0000 Subject: [PATCH 1/2] chore(firestore): silence conformance logs and fix system test concurrency --- handwritten/firestore/dev/conformance/runner.ts | 2 -- handwritten/firestore/dev/system-test/firestore.ts | 4 ++-- handwritten/firestore/package.json | 8 ++++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/handwritten/firestore/dev/conformance/runner.ts b/handwritten/firestore/dev/conformance/runner.ts index 54bf22e77d4d..8acd520a4822 100644 --- a/handwritten/firestore/dev/conformance/runner.ts +++ b/handwritten/firestore/dev/conformance/runner.ts @@ -312,8 +312,6 @@ function getHandler(spec: ConformanceProto) { } function runTest(spec: ConformanceProto) { - console.log(`Running Spec:\n${JSON.stringify(spec, null, 2)}\n`); - const updateTest = (spec: ConformanceProto) => { const overrides = {commit: commitHandler(spec)}; return createInstance(overrides).then(() => { diff --git a/handwritten/firestore/dev/system-test/firestore.ts b/handwritten/firestore/dev/system-test/firestore.ts index a85ed7f41b42..de94e15ad54d 100644 --- a/handwritten/firestore/dev/system-test/firestore.ts +++ b/handwritten/firestore/dev/system-test/firestore.ts @@ -1946,8 +1946,8 @@ describe('runs query on a large collection', () => { let randomCol: CollectionReference; beforeEach(async () => { - firestore = new Firestore({}); - randomCol = getTestRoot(firestore); + randomCol = getTestRoot(); + firestore = randomCol.firestore; const promises: Array>> = []; for (let i = 0; i < 1000; i++) { diff --git a/handwritten/firestore/package.json b/handwritten/firestore/package.json index 0dee01e6dcfc..6ac099031d3d 100644 --- a/handwritten/firestore/package.json +++ b/handwritten/firestore/package.json @@ -47,9 +47,13 @@ "system-test:enterprise:emulator:rest": "RUN_ENTERPRISE_TESTS=yes FIRESTORE_DATABASE_ID=firestore-enterprise FIRESTORE_EMULATOR_HOST=localhost:8080 FIRESTORE_PREFER_REST=true mocha build/system-test --timeout 1200000", "system-test:emulator:grpc": "FIRESTORE_EMULATOR_HOST=localhost:8080 mocha build/system-test --timeout 1200000", "system-test:enterprise:emulator:grpc": "RUN_ENTERPRISE_TESTS=yes FIRESTORE_DATABASE_ID=firestore-enterprise FIRESTORE_EMULATOR_HOST=localhost:8080 mocha build/system-test --timeout 1200000", - "system-test": "concurrently -p \"[{name}]\" -n \"grpc,rest,enterprise-grpc,enterprise-rest\" -c \"cyan,magenta,blue,yellow\" \"npm:system-test:grpc\" \"npm:system-test:rest\" \"npm:system-test:enterprise:grpc\" \"npm:system-test:enterprise:rest\"", + "system-test:standard": "npm run system-test:grpc && npm run system-test:rest", + "system-test:enterprise": "npm run system-test:enterprise:grpc && npm run system-test:enterprise:rest", + "system-test": "npm run system-test:standard && npm run system-test:enterprise", "system-test:nightly": "FIRESTORE_TARGET_BACKEND=nightly FIRESTORE_DATABASE_ID=enterprise RUN_ENTERPRISE_TESTS=yes GCLOUD_PROJECT=firestore-sdk-nightly mocha build/system-test --timeout 1200000", - "system-test:emulator": "concurrently -p \"[{name}]\" -n \"grpc,rest,enterprise-grpc,enterprise-rest\" -c \"cyan,magenta,blue,yellow\" \"npm:system-test:emulator:grpc\" \"npm:system-test:emulator:rest\" \"npm:system-test:enterprise:emulator:grpc\" \"npm:system-test:enterprise:emulator:rest\"", + "system-test:emulator:standard": "npm run system-test:emulator:grpc && npm run system-test:emulator:rest", + "system-test:emulator:enterprise": "npm run system-test:enterprise:emulator:grpc && npm run system-test:enterprise:emulator:rest", + "system-test:emulator": "npm run system-test:emulator:standard && npm run system-test:emulator:enterprise", "presystem-test": "npm run compile", "conformance": "mocha build/conformance", "test-only": "c8 mocha build/test", From 9baab58473b24d0cb5eb0862cc5f962eebb1d71a Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Mon, 3 Aug 2026 21:15:45 +0000 Subject: [PATCH 2/2] revert changes to firestore system-test concurrency --- handwritten/firestore/package.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/handwritten/firestore/package.json b/handwritten/firestore/package.json index 6ac099031d3d..0dee01e6dcfc 100644 --- a/handwritten/firestore/package.json +++ b/handwritten/firestore/package.json @@ -47,13 +47,9 @@ "system-test:enterprise:emulator:rest": "RUN_ENTERPRISE_TESTS=yes FIRESTORE_DATABASE_ID=firestore-enterprise FIRESTORE_EMULATOR_HOST=localhost:8080 FIRESTORE_PREFER_REST=true mocha build/system-test --timeout 1200000", "system-test:emulator:grpc": "FIRESTORE_EMULATOR_HOST=localhost:8080 mocha build/system-test --timeout 1200000", "system-test:enterprise:emulator:grpc": "RUN_ENTERPRISE_TESTS=yes FIRESTORE_DATABASE_ID=firestore-enterprise FIRESTORE_EMULATOR_HOST=localhost:8080 mocha build/system-test --timeout 1200000", - "system-test:standard": "npm run system-test:grpc && npm run system-test:rest", - "system-test:enterprise": "npm run system-test:enterprise:grpc && npm run system-test:enterprise:rest", - "system-test": "npm run system-test:standard && npm run system-test:enterprise", + "system-test": "concurrently -p \"[{name}]\" -n \"grpc,rest,enterprise-grpc,enterprise-rest\" -c \"cyan,magenta,blue,yellow\" \"npm:system-test:grpc\" \"npm:system-test:rest\" \"npm:system-test:enterprise:grpc\" \"npm:system-test:enterprise:rest\"", "system-test:nightly": "FIRESTORE_TARGET_BACKEND=nightly FIRESTORE_DATABASE_ID=enterprise RUN_ENTERPRISE_TESTS=yes GCLOUD_PROJECT=firestore-sdk-nightly mocha build/system-test --timeout 1200000", - "system-test:emulator:standard": "npm run system-test:emulator:grpc && npm run system-test:emulator:rest", - "system-test:emulator:enterprise": "npm run system-test:enterprise:emulator:grpc && npm run system-test:enterprise:emulator:rest", - "system-test:emulator": "npm run system-test:emulator:standard && npm run system-test:emulator:enterprise", + "system-test:emulator": "concurrently -p \"[{name}]\" -n \"grpc,rest,enterprise-grpc,enterprise-rest\" -c \"cyan,magenta,blue,yellow\" \"npm:system-test:emulator:grpc\" \"npm:system-test:emulator:rest\" \"npm:system-test:enterprise:emulator:grpc\" \"npm:system-test:enterprise:emulator:rest\"", "presystem-test": "npm run compile", "conformance": "mocha build/conformance", "test-only": "c8 mocha build/test",