Skip to content

test: run system tests in parallel and fix collection name conflicts #7980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wu-hui wants to merge 3 commits into
base: main
Choose a base branch
from
+37 −39
Open

test: run system tests in parallel and fix collection name conflicts #7980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77e84c6
test: run system tests in parallel and fix collection name conflicts
wu-hui Apr 8, 2026
8ca3f2f
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Apr 8, 2026
ebbfd3b
Merge branch 'main' into run-system-tests-in-parallel
wu-hui Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions handwritten/firestore/dev/system-test/firestore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1741,7 +1741,8 @@ describe('DocumentReference class', () => {
},
};

const coll = firestore.collection('tests');
const coll = firestore.collection('node_tests_' + autoId());

const ref = coll.doc('number').withConverter(primitiveConverter);
await ref.set(3);
const result = await ref.get();
Expand Down Expand Up @@ -7436,7 +7437,8 @@ describe('BulkWriter class', () => {
// TODO enterprise b/469490062
it.skipEnterprise('does not affect other collections', async () => {
// Add other nested collection that shouldn't be deleted.
const collB = firestore.collection('doggos');
const collB = firestore.collection('node_doggos_' + autoId());

await collB.doc('doggo').set({name: 'goodboi'});

await firestore.recursiveDelete(collB);
Expand Down
65 changes: 30 additions & 35 deletions handwritten/firestore/dev/system-test/tracing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ import {
SpanProcessor,
TimedEvent,
} from '@opentelemetry/sdk-trace-node';
import {setLogFunction, Firestore} from '../src';
import {setLogFunction, Firestore, CollectionReference} from '../src';
import {autoId} from '../src/util';
import {verifyInstance} from '../test/util/helpers';
import {
ATTRIBUTE_GCP_RESOURCE_NAME,
Expand Down Expand Up @@ -159,6 +160,7 @@ class SpanData {

describe.skipEnterprise('Tracing Tests', () => {
let firestore: Firestore;
let randomCol: CollectionReference;
let tracerProvider: NodeTracerProvider;
let inMemorySpanExporter: InMemorySpanExporter;
let consoleSpanExporter: ConsoleSpanExporter;
Expand Down Expand Up @@ -299,6 +301,7 @@ describe.skipEnterprise('Tracing Tests', () => {
}

firestore = new Firestore(settings);
randomCol = firestore.collection('node_tracing_' + autoId());
}

function getSettingsAttributes(): Attributes {
Expand Down Expand Up @@ -767,9 +770,7 @@ describe.skipEnterprise('Tracing Tests', () => {

function runTestCases() {
it('document reference get()', async () => {
await runFirestoreOperationInRootSpan(() =>
firestore.collection('foo').doc('bar').get(),
);
await runFirestoreOperationInRootSpan(() => randomCol.doc('bar').get());
await waitForCompletedSpans(3);
expectSpanHierarchy(
SPAN_NAME_TEST_ROOT,
Expand All @@ -788,9 +789,7 @@ describe.skipEnterprise('Tracing Tests', () => {
});

it('document reference create()', async () => {
await runFirestoreOperationInRootSpan(() =>
firestore.collection('foo').doc().create({}),
);
await runFirestoreOperationInRootSpan(() => randomCol.doc().create({}));
await waitForCompletedSpans(3);
expectSpanHierarchy(
SPAN_NAME_TEST_ROOT,
Expand All @@ -805,7 +804,7 @@ describe.skipEnterprise('Tracing Tests', () => {

it('document reference delete()', async () => {
await runFirestoreOperationInRootSpan(() =>
firestore.collection('foo').doc('bar').delete(),
randomCol.doc('bar').delete(),
);
await waitForCompletedSpans(3);
expectSpanHierarchy(
Expand All @@ -821,7 +820,7 @@ describe.skipEnterprise('Tracing Tests', () => {

it('document reference set()', async () => {
await runFirestoreOperationInRootSpan(() =>
firestore.collection('foo').doc('bar').set({foo: 'bar'}),
randomCol.doc('bar').set({foo: 'bar'}),
);
await waitForCompletedSpans(3);
expectSpanHierarchy(
Expand All @@ -838,10 +837,10 @@ describe.skipEnterprise('Tracing Tests', () => {
it('document reference update()', async () => {
// Make sure the document exists before updating it.
// Perform the `set` operation outside of the root span.
await firestore.collection('foo').doc('bar').set({foo: 'bar'});
await randomCol.doc('bar').set({foo: 'bar'});

await runFirestoreOperationInRootSpan(() =>
firestore.collection('foo').doc('bar').update('foo', 'bar2'),
randomCol.doc('bar').update('foo', 'bar2'),
);
await waitForCompletedSpans(3);
expectSpanHierarchy(
Expand All @@ -857,7 +856,7 @@ describe.skipEnterprise('Tracing Tests', () => {

it('document reference list collections', async () => {
await runFirestoreOperationInRootSpan(() =>
firestore.collection('foo').doc('bar').listCollections(),
randomCol.doc('bar').listCollections(),
);
await waitForCompletedSpans(2);
expectSpanHierarchy(
Expand All @@ -871,9 +870,7 @@ describe.skipEnterprise('Tracing Tests', () => {
});

it('aggregate query get()', async () => {
await runFirestoreOperationInRootSpan(() =>
firestore.collection('foo').count().get(),
);
await runFirestoreOperationInRootSpan(() => randomCol.count().get());
await waitForCompletedSpans(2);
expectSpanHierarchy(SPAN_NAME_TEST_ROOT, SPAN_NAME_AGGREGATION_QUERY_GET);
expectSpanHasEvents(SPAN_NAME_AGGREGATION_QUERY_GET, [
Expand All @@ -884,9 +881,7 @@ describe.skipEnterprise('Tracing Tests', () => {
});

it('collection reference add()', async () => {
await runFirestoreOperationInRootSpan(() =>
firestore.collection('foo').add({foo: 'bar'}),
);
await runFirestoreOperationInRootSpan(() => randomCol.add({foo: 'bar'}));
await waitForCompletedSpans(4);
expectSpanHierarchy(
SPAN_NAME_TEST_ROOT,
Expand All @@ -902,9 +897,7 @@ describe.skipEnterprise('Tracing Tests', () => {

// Enterprise: field mask is not supported
it.skipEnterprise('collection reference list documents', async () => {
await runFirestoreOperationInRootSpan(() =>
firestore.collection('foo').listDocuments(),
);
await runFirestoreOperationInRootSpan(() => randomCol.listDocuments());
await waitForCompletedSpans(2);
expectSpanHierarchy(
SPAN_NAME_TEST_ROOT,
Expand All @@ -918,7 +911,7 @@ describe.skipEnterprise('Tracing Tests', () => {

it('query get()', async () => {
await runFirestoreOperationInRootSpan(() =>
firestore.collection('foo').where('foo', '==', 'bar').limit(1).get(),
randomCol.where('foo', '==', 'bar').limit(1).get(),
);
await waitForCompletedSpans(2);
expectSpanHierarchy(SPAN_NAME_TEST_ROOT, SPAN_NAME_QUERY_GET);
Expand All @@ -935,8 +928,8 @@ describe.skipEnterprise('Tracing Tests', () => {
});

it('firestore getAll()', async () => {
const docRef1 = firestore.collection('foo').doc('1');
const docRef2 = firestore.collection('foo').doc('2');
const docRef1 = randomCol.doc('1');
const docRef2 = randomCol.doc('2');
await runFirestoreOperationInRootSpan(() =>
firestore.getAll(docRef1, docRef2),
);
Expand All @@ -954,16 +947,18 @@ describe.skipEnterprise('Tracing Tests', () => {
});

it('transaction', async () => {
const docRef1 = firestore.collection('foo').doc('bar');
const docRef2 = firestore.collection('foo').doc('bar');
const docRef1 = randomCol.doc('bar');
const docRef2 = randomCol.doc('bar');

await runFirestoreOperationInRootSpan(async () => {
return firestore.runTransaction(async transaction => {
await transaction.get(docRef1);
await transaction.getAll(docRef1, docRef2);
await transaction.get(firestore.collection('foo').limit(1));
await transaction.get(firestore.collection('nonexistent').count());
transaction.set(firestore.collection('foo').doc(), {foo: 'bar'});
await transaction.get(randomCol.limit(1));
await transaction.get(
firestore.collection('nonexistent_' + autoId()).count(),
);
transaction.set(randomCol.doc(), {foo: 'bar'});
});
});

Expand Down Expand Up @@ -1032,7 +1027,7 @@ describe.skipEnterprise('Tracing Tests', () => {
// Service not implemented for Enterprise DB: PartitionQuery
it.skipEnterprise('partition query', async () => {
await runFirestoreOperationInRootSpan(async () => {
const query = firestore.collectionGroup('foo');
const query = firestore.collectionGroup('node_cg_' + autoId());
let numPartitions = 0;
// eslint-disable-next-line @typescript-eslint/no-unused-vars
for await (const partition of query.getPartitions(3)) {
Expand All @@ -1052,11 +1047,11 @@ describe.skipEnterprise('Tracing Tests', () => {
await runFirestoreOperationInRootSpan(async () => {
const bulkWriter = firestore.bulkWriter();
// No need to await the set operations as 'close()' will commit all writes before closing.
void bulkWriter.set(firestore.collection('foo').doc(), {foo: 1});
void bulkWriter.set(firestore.collection('foo').doc(), {foo: 2});
void bulkWriter.set(firestore.collection('foo').doc(), {foo: 3});
void bulkWriter.set(firestore.collection('foo').doc(), {foo: 4});
void bulkWriter.set(firestore.collection('foo').doc(), {foo: 5});
void bulkWriter.set(randomCol.doc(), {foo: 1});
void bulkWriter.set(randomCol.doc(), {foo: 2});
void bulkWriter.set(randomCol.doc(), {foo: 3});
void bulkWriter.set(randomCol.doc(), {foo: 4});
void bulkWriter.set(randomCol.doc(), {foo: 5});
await bulkWriter.close();
});

Expand Down
5 changes: 3 additions & 2 deletions handwritten/firestore/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
"system-test:named-db:emulator:rest": "FIRESTORE_NAMED_DATABASE=test-db 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:named-db:emulator:grpc": "FIRESTORE_NAMED_DATABASE=test-db FIRESTORE_EMULATOR_HOST=localhost:8080 mocha build/system-test --timeout 1200000",
"system-test": "npm run system-test:grpc && npm run system-test:rest && npm run system-test:named-db:grpc && npm run system-test:named-db:rest",
"system-test": "concurrently -p \"[{name}]\" -n \"grpc,rest,named-db-grpc,named-db-rest\" -c \"cyan,magenta,blue,yellow\" \"npm:system-test:grpc\" \"npm:system-test:rest\" \"npm:system-test:named-db:grpc\" \"npm:system-test:named-db:rest\"",
"system-test:nightly": "FIRESTORE_TARGET_BACKEND=nightly FIRESTORE_NAMED_DATABASE=enterprise RUN_ENTERPRISE_TESTS=yes GCLOUD_PROJECT=firestore-sdk-nightly mocha build/system-test --timeout 1200000",
"system-test:emulator": "npm run system-test:emulator:grpc && npm run system-test:emulator:rest && npm run system-test:named-db:emulator:grpc && npm run system-test:named-db:emulator:rest",
"system-test:emulator": "concurrently -p \"[{name}]\" -n \"grpc,rest,named-db-grpc,named-db-rest\" -c \"cyan,magenta,blue,yellow\" \"npm:system-test:emulator:grpc\" \"npm:system-test:emulator:rest\" \"npm:system-test:named-db:emulator:grpc\" \"npm:system-test:named-db:emulator:rest\"",
"presystem-test": "npm run compile",
"samples-test": "npm link && cd samples/ && npm link ../ && npm test && cd ../",
"conformance": "mocha build/conformance",
Expand Down Expand Up @@ -96,6 +96,7 @@
"chai": "^4.5.0",
"chai-as-promised": "^7.1.2",
"codecov": "^3.8.3",
"concurrently": "^9.1.2",
"duplexify": "^4.1.3",
"eslint-plugin-node": "^11.1.0",
"execa": "^9.6.0",
Expand Down
Loading