Merge remote-tracking branch 'remotes/origin/dconeybe/SnappyPatchRevert' into TransactionOptions

Author: dconeybe

.github/workflows/integration_tests.yml

@@ -1146,11 +1146,21 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: 14.x
+      - name: Setup java 17 for Firestore emulator
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
       - name: Setup Firestore Emulator
         if: steps.get-device-type.outputs.device_type == 'virtual' && contains(needs.check_and_prepare.outputs.apis, 'firestore')
         run: |
           npm install -g firebase-tools
           firebase emulators:start --only firestore --project demo-example &
+      - name: Setup java 8 for test_simulator.py
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '8'
       - name: Run Android integration tests on Emulator locally
         timeout-minutes: 120
         if: steps.get-device-type.outputs.device_type == 'virtual'
@@ -1251,6 +1261,11 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: 14.x
+      - name: Setup java for Firestore emulator
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
       - name: Setup Firestore Emulator
         if: steps.get-device-type.outputs.device_type == 'virtual' && contains(needs.check_and_prepare.outputs.apis, 'firestore')
         run: |
@@ -1350,6 +1365,11 @@ jobs:
           timeout_minutes: 1
           max_attempts: 3
           command: pip install -r scripts/gha/requirements.txt
+      - name: Setup java for Firestore emulator
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
       - name: Setup Firestore Emulator
         if: contains(needs.check_and_prepare.outputs.apis, 'firestore')
         run: |

firestore/integration_test_internal/src/bundle_test.cc

@@ -142,9 +142,6 @@ class BundleTest : public FirestoreIntegrationTest {
 };
 
 TEST_F(BundleTest, CanLoadBundlesWithoutProgressUpdates) {
-  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
-                  "Actions and needs to be investigated (b/233751585)";
-
   Firestore* db = TestFirestore();
   auto bundle = CreateTestBundle(db);
 
@@ -155,9 +152,6 @@ TEST_F(BundleTest, CanLoadBundlesWithoutProgressUpdates) {
 }
 
 TEST_F(BundleTest, CanLoadBundlesWithProgressUpdates) {
-  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
-                  "Actions and needs to be investigated (b/233751585)";
-
   Firestore* db = TestFirestore();
   auto bundle = CreateTestBundle(db);
 
@@ -186,9 +180,6 @@ TEST_F(BundleTest, CanLoadBundlesWithProgressUpdates) {
 }
 
 TEST_F(BundleTest, CanDeleteFirestoreFromProgressUpdate) {
-  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
-                  "Actions and needs to be investigated (b/233751585)";
-
   Firestore* db = TestFirestore();
   auto bundle = CreateTestBundle(db);
 
@@ -225,9 +216,6 @@ TEST_F(BundleTest, CanDeleteFirestoreFromProgressUpdate) {
 }
 
 TEST_F(BundleTest, LoadBundlesForASecondTimeSkips) {
-  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
-                  "Actions and needs to be investigated (b/233751585)";
-
   // TODO(wuandy): This test fails on Windows CI, but
   // local run is fine. We need to figure out why and re-enable it.
   SKIP_TEST_ON_WINDOWS;
@@ -256,9 +244,6 @@ TEST_F(BundleTest, LoadBundlesForASecondTimeSkips) {
 }
 
 TEST_F(BundleTest, LoadInvalidBundlesShouldFail) {
-  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
-                  "Actions and needs to be investigated (b/233751585)";
-
   // TODO(wuandy): This test fails on Windows CI, but
   // local run is fine. We need to figure out why and re-enable it.
   SKIP_TEST_ON_WINDOWS;
@@ -288,9 +273,6 @@ TEST_F(BundleTest, LoadInvalidBundlesShouldFail) {
 }
 
 TEST_F(BundleTest, LoadBundleWithDocumentsAlreadyPulledFromBackend) {
-  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
-                  "Actions and needs to be investigated (b/233751585)";
-
   // TODO(wuandy, b/189477267): This test fails on Windows CI, but
   // local run is fine. We need to figure out why and re-enable it.
   SKIP_TEST_ON_WINDOWS;
@@ -337,9 +319,6 @@ TEST_F(BundleTest, LoadBundleWithDocumentsAlreadyPulledFromBackend) {
 }
 
 TEST_F(BundleTest, LoadedDocumentsShouldNotBeGarbageCollectedRightAway) {
-  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
-                  "Actions and needs to be investigated (b/233751585)";
-
   // TODO(wuandy, b/189477267): This test fails on Windows CI, but
   // local run is fine. We need to figure out why and re-enable it.
   SKIP_TEST_ON_WINDOWS;
@@ -364,9 +343,6 @@ TEST_F(BundleTest, LoadedDocumentsShouldNotBeGarbageCollectedRightAway) {
 }
 
 TEST_F(BundleTest, LoadDocumentsFromOtherProjectsShouldFail) {
-  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
-                  "Actions and needs to be investigated (b/233751585)";
-
   Firestore* db = TestFirestore();
   auto bundle = CreateBundle("other-project");
   std::vector<LoadBundleTaskProgress> progresses;
@@ -387,9 +363,6 @@ TEST_F(BundleTest, LoadDocumentsFromOtherProjectsShouldFail) {
 }
 
 TEST_F(BundleTest, GetInvalidNamedQuery) {
-  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
-                  "Actions and needs to be investigated (b/233751585)";
-
   Firestore* db = TestFirestore();
   {
     auto future = db->NamedQuery("DOES_NOT_EXIST");