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

Author: wu-hui

handwritten/firestore/dev/system-test/firestore.ts

@@ -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();
@@ -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);

handwritten/firestore/dev/system-test/tracing.ts

@@ -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,
@@ -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;
@@ -299,6 +301,7 @@ describe.skipEnterprise('Tracing Tests', () => {
     }
 
     firestore = new Firestore(settings);
+    randomCol = firestore.collection('node_tracing_' + autoId());
   }
 
   function getSettingsAttributes(): Attributes {
@@ -768,7 +771,7 @@ describe.skipEnterprise('Tracing Tests', () => {
   function runTestCases() {
     it('document reference get()', async () => {
       await runFirestoreOperationInRootSpan(() =>
-        firestore.collection('foo').doc('bar').get(),
+        randomCol.doc('bar').get(),
       );
       await waitForCompletedSpans(3);
       expectSpanHierarchy(
@@ -789,7 +792,7 @@ describe.skipEnterprise('Tracing Tests', () => {
 
     it('document reference create()', async () => {
       await runFirestoreOperationInRootSpan(() =>
-        firestore.collection('foo').doc().create({}),
+        randomCol.doc().create({}),
       );
       await waitForCompletedSpans(3);
       expectSpanHierarchy(
@@ -805,7 +808,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(
@@ -821,7 +824,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(
@@ -838,10 +841,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(
@@ -857,7 +860,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(
@@ -872,7 +875,7 @@ describe.skipEnterprise('Tracing Tests', () => {
 
     it('aggregate query get()', async () => {
       await runFirestoreOperationInRootSpan(() =>
-        firestore.collection('foo').count().get(),
+        randomCol.count().get(),
       );
       await waitForCompletedSpans(2);
       expectSpanHierarchy(SPAN_NAME_TEST_ROOT, SPAN_NAME_AGGREGATION_QUERY_GET);
@@ -885,7 +888,7 @@ describe.skipEnterprise('Tracing Tests', () => {
 
     it('collection reference add()', async () => {
       await runFirestoreOperationInRootSpan(() =>
-        firestore.collection('foo').add({foo: 'bar'}),
+        randomCol.add({foo: 'bar'}),
       );
       await waitForCompletedSpans(4);
       expectSpanHierarchy(
@@ -903,7 +906,7 @@ describe.skipEnterprise('Tracing Tests', () => {
     // Enterprise: field mask is not supported
     it.skipEnterprise('collection reference list documents', async () => {
       await runFirestoreOperationInRootSpan(() =>
-        firestore.collection('foo').listDocuments(),
+        randomCol.listDocuments(),
       );
       await waitForCompletedSpans(2);
       expectSpanHierarchy(
@@ -918,7 +921,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);
@@ -935,8 +938,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),
       );
@@ -954,16 +957,16 @@ 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'});
         });
       });
 
@@ -1032,7 +1035,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)) {
@@ -1052,11 +1055,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();
       });
 

handwritten/firestore/package.json

@@ -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",
@@ -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",