Merge remote-tracking branch 'origin/master' into markduckworth/run-rpc-path-special-chars_PR7402

Author: dconeybe

packages/firestore-compat/test/transactions.test.ts

@@ -241,7 +241,7 @@ apiDescribe('Database transactions', (persistence: boolean) => {
         .run(get, set1, set2)
         .expectDoc({ foo: 'bar2' });
     });
-  });
+  }).timeout(10000);
 
   it('runs transactions after getting non-existent document', async () => {
     return integrationHelpers.withTestDb(persistence, async db => {
@@ -280,7 +280,7 @@ apiDescribe('Database transactions', (persistence: boolean) => {
         .run(get, set1, set2)
         .expectDoc({ foo: 'bar2' });
     });
-  });
+  }).timeout(10000);
 
   it('runs transactions on existing document', async () => {
     return integrationHelpers.withTestDb(persistence, async db => {