Merge branch 'dev' into feature/aks-improve-logging

Author: DellaBitta

.github/workflows/cpp-packaging.yml

@@ -620,8 +620,8 @@ jobs:
       fail-fast: false
     env:
       apis: admob,analytics,auth,database,dynamic_links,firestore,functions,instance_id,messaging,remote_config,storage
-      android_device: flame
-      android_api: 29
+      android_device: walleye
+      android_api: 27
       ios_device: iphone11pro
       ios_version: 13.3
     steps:

.github/workflows/integration_tests.yml

@@ -17,10 +17,10 @@ on:
         required: true
       android_device:
         description: 'Android device model'
-        default: 'flame'
+        default: 'walleye'
       android_api:
         description: 'Android API level'
-        default: '29'
+        default: '27'
       ios_device:
         description: 'iOS device model'
         default: 'iphone11pro'

auth/integration_test/src/integration_test.cc

@@ -56,8 +56,13 @@ static const int kPhoneAuthCompletionWaitMs = 8000;  // NOLINT
 static const int kPhoneAuthTimeoutMs = 0;            // NOLINT
 
 // Set these in Firebase Console for your app.
-static const char kPhoneAuthTestPhoneNumber[] = "+12345556789";  // NOLINT
-static const char kPhoneAuthTestVerificationCode[] = "123456";   // NOLINT
+static const char* kPhoneAuthTestPhoneNumbers[] = {
+    "+12345556780", "+12345556781", "+12345556782", "+12345556783",
+    "+12345556784", "+12345556785", "+12345556786", "+12345556787",
+    "+12345556788", "+12345556789"};                            // NOLINT
+static const char kPhoneAuthTestVerificationCode[] = "123456";  // NOLINT
+static const int kPhoneAuthTestNumPhoneNumbers =
+    sizeof(kPhoneAuthTestPhoneNumbers) / sizeof(kPhoneAuthTestPhoneNumbers[0]);
 
 static const char kTestPassword[] = "testEmailPassword123";
 static const char kTestEmailBad[] = "[email protected]";
@@ -860,8 +865,12 @@ TEST_F(FirebaseAuthTest, TestPhoneAuth) {
     LogDebug("Creating listener.");
     PhoneListener listener;
     LogDebug("Calling VerifyPhoneNumber.");
-    phone_provider.VerifyPhoneNumber(kPhoneAuthTestPhoneNumber,
-                                     kPhoneAuthTimeoutMs, nullptr, &listener);
+    // Randomly choose one of the phone numbers to avoid collisions.
+    const int random_phone_number =
+        app_framework::GetCurrentTimeInMicroseconds() % kPhoneAuthTestNumPhoneNumbers;
+    phone_provider.VerifyPhoneNumber(
+        kPhoneAuthTestPhoneNumbers[random_phone_number], kPhoneAuthTimeoutMs,
+        nullptr, &listener);
     // Wait for OnCodeSent() callback.
     int wait_ms = 0;
     LogDebug("Waiting for code send.");