Merge branch 'main' into distribute-ftl-tests

firebase · Oct 11, 2023 · 72ef77e · 72ef77e
2 parents 99198ee + 314ac67
commit 72ef77e
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/gma/integration_test/src/integration_test.cc b/gma/integration_test/src/integration_test.cc
@@ -3023,6 +3023,8 @@ TEST_F(FirebaseGmaUmpTest, TestUmpCallbacksOnWrongInstance) {
 
 TEST_F(FirebaseGmaUmpTest, TestUmpMethodsReturnOperationInProgress) {
   SKIP_TEST_ON_DESKTOP;
+  SKIP_TEST_ON_IOS_SIMULATOR;  // LoadAndShowConsentFormIfRequired
+                               // is too quick on simulator.
 
   using firebase::gma::ump::ConsentFormStatus;
   using firebase::gma::ump::ConsentRequestParameters;