diff options
| author | Robert Marcus <ramarcus@google.com> | 2023-02-24 16:25:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-02-24 16:25:30 +0000 |
| commit | 85671916219abde20f292c857dbf0fc484285590 (patch) | |
| tree | 095d86b11e3cfcccb7d50221f58236fce8989934 | |
| parent | 253236a615d10357c45f377c389b3feb2bb2413f (diff) | |
| parent | f855f5909b59127d89440fd83dd1baafc191ec5e (diff) | |
| download | support-85671916219abde20f292c857dbf0fc484285590.tar.gz | |
Merge "Try to fix flakiness of e2e tests" into androidx-main
3 files changed, 15 insertions, 2 deletions
diff --git a/privacysandbox/ads/ads-adservices-java/src/androidTest/java/androidx/privacysandbox/ads/adservices/java/endtoend/adid/AdIdManagerTest.java b/privacysandbox/ads/ads-adservices-java/src/androidTest/java/androidx/privacysandbox/ads/adservices/java/endtoend/adid/AdIdManagerTest.java index 20294a12c1c..4b6e6bc1c0e 100644 --- a/privacysandbox/ads/ads-adservices-java/src/androidTest/java/androidx/privacysandbox/ads/adservices/java/endtoend/adid/AdIdManagerTest.java +++ b/privacysandbox/ads/ads-adservices-java/src/androidTest/java/androidx/privacysandbox/ads/adservices/java/endtoend/adid/AdIdManagerTest.java @@ -36,7 +36,8 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class AdIdManagerTest { private static final String TAG = "AdIdManagerTest"; - private TestUtil mTestUtil = new TestUtil(InstrumentationRegistry.getInstrumentation(), TAG); + private TestUtil mTestUtil = new TestUtil(InstrumentationRegistry.getInstrumentation(), + TAG); @Before public void setup() throws Exception { @@ -44,6 +45,10 @@ public class AdIdManagerTest { mTestUtil.overrideKillSwitches(true); mTestUtil.overrideConsentManagerDebugMode(true); mTestUtil.overrideAllowlists(true); + + // Put in a short sleep to make sure the updated config propagates + // before starting the tests + Thread.sleep(100); } @After diff --git a/privacysandbox/ads/ads-adservices-java/src/androidTest/java/androidx/privacysandbox/ads/adservices/java/endtoend/appsetid/AppSetIdManagerTest.java b/privacysandbox/ads/ads-adservices-java/src/androidTest/java/androidx/privacysandbox/ads/adservices/java/endtoend/appsetid/AppSetIdManagerTest.java index 88973750514..8bbe0638c55 100644 --- a/privacysandbox/ads/ads-adservices-java/src/androidTest/java/androidx/privacysandbox/ads/adservices/java/endtoend/appsetid/AppSetIdManagerTest.java +++ b/privacysandbox/ads/ads-adservices-java/src/androidTest/java/androidx/privacysandbox/ads/adservices/java/endtoend/appsetid/AppSetIdManagerTest.java @@ -43,6 +43,10 @@ public class AppSetIdManagerTest { mTestUtil.overrideAppSetIdKillSwitch(true); mTestUtil.overrideKillSwitches(true); mTestUtil.overrideAllowlists(true); + + // Put in a short sleep to make sure the updated config propagates + // before starting the tests + Thread.sleep(100); } @After diff --git a/privacysandbox/ads/ads-adservices-java/src/androidTest/java/androidx/privacysandbox/ads/adservices/java/endtoend/measurement/MeasurementManagerTest.java b/privacysandbox/ads/ads-adservices-java/src/androidTest/java/androidx/privacysandbox/ads/adservices/java/endtoend/measurement/MeasurementManagerTest.java index 2cb7889c7e3..e3f123560d5 100644 --- a/privacysandbox/ads/ads-adservices-java/src/androidTest/java/androidx/privacysandbox/ads/adservices/java/endtoend/measurement/MeasurementManagerTest.java +++ b/privacysandbox/ads/ads-adservices-java/src/androidTest/java/androidx/privacysandbox/ads/adservices/java/endtoend/measurement/MeasurementManagerTest.java @@ -66,7 +66,7 @@ public class MeasurementManagerTest { private MeasurementManagerFutures mMeasurementManager; @Before - public void setup() { + public void setup() throws Exception { // To grant access to all pp api app mTestUtil.overrideAllowlists(true); // We need to turn the Consent Manager into debug mode @@ -75,6 +75,10 @@ public class MeasurementManagerTest { mTestUtil.overrideDisableMeasurementEnrollmentCheck("1"); mMeasurementManager = MeasurementManagerFutures.from(ApplicationProvider.getApplicationContext()); + + // Put in a short sleep to make sure the updated config propagates + // before starting the tests + Thread.sleep(100); } @After |