summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXufan Xiong <xufan@google.com>2023-11-09 00:19:58 +0000
committerXufan Xiong <xufan@google.com>2023-11-09 00:28:13 +0000
commit497603d55d005575b570d0b870f0feca2adf6b96 (patch)
tree47a2c8dad0896aa9a0472f458f37467301ec8161
parent1e1b46c8b17c4f2b9df9338faa5a502cc36cbfd7 (diff)
downloadAdServices-497603d55d005575b570d0b870f0feca2adf6b96.tar.gz
Mark some flaky topics tests as @FlakyTest in android14-tests-dev.
Mark TopicsManagerTest as flaky because we need more time to deep dive them. Topics code yellow doc: http://shortn/_Jq0NjipLEe Bug: 305161422 Change-Id: I7e6910299a618386e27dd96874dbd863bd505362
-rw-r--r--adservices/TEST_MAPPING7
-rw-r--r--adservices/tests/cts/endtoends/topics/src/com/android/adservices/tests/cts/topics/TopicsManagerTest.java6
2 files changed, 12 insertions, 1 deletions
diff --git a/adservices/TEST_MAPPING b/adservices/TEST_MAPPING
index cbfc727ed..67e3b4415 100644
--- a/adservices/TEST_MAPPING
+++ b/adservices/TEST_MAPPING
@@ -42,7 +42,12 @@
},
{
// Install com.google.android.adservices.apex and run CtsAdServicesEndToEndTests.
- "name": "CtsAdServicesEndToEndTests[com.google.android.adservices.apex]"
+ "name": "CtsAdServicesEndToEndTests[com.google.android.adservices.apex]",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
},
{
"name": "CtsAdServicesEndToEndTestMeasurement[com.google.android.adservices.apex]"
diff --git a/adservices/tests/cts/endtoends/topics/src/com/android/adservices/tests/cts/topics/TopicsManagerTest.java b/adservices/tests/cts/endtoends/topics/src/com/android/adservices/tests/cts/topics/TopicsManagerTest.java
index 2dbeae09b..234641080 100644
--- a/adservices/tests/cts/endtoends/topics/src/com/android/adservices/tests/cts/topics/TopicsManagerTest.java
+++ b/adservices/tests/cts/endtoends/topics/src/com/android/adservices/tests/cts/topics/TopicsManagerTest.java
@@ -27,6 +27,7 @@ import android.adservices.topics.Topic;
import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
+import androidx.test.filters.FlakyTest;
import com.android.adservices.common.AdServicesSupportRule;
import com.android.adservices.common.AdservicesTestHelper;
@@ -128,6 +129,7 @@ public class TopicsManagerTest {
}
@Test
+ @FlakyTest(bugId = 302384321)
public void testTopicsManager_testTopicsKillSwitch() throws Exception {
// Override Topics kill switch to disable Topics API.
overrideTopicsKillSwitch(true);
@@ -157,12 +159,14 @@ public class TopicsManagerTest {
}
@Test
+ @FlakyTest(bugId = 302384321)
public void testTopicsManager_runDefaultClassifier_usingGetMethodToCreateManager()
throws Exception {
testTopicsManager_runDefaultClassifier(/* useGetMethodToCreateManager */ true);
}
@Test
+ @FlakyTest(bugId = 302384321)
public void testTopicsManager_runDefaultClassifier() throws Exception {
testTopicsManager_runDefaultClassifier(/* useGetMethodToCreateManager */ false);
}
@@ -233,12 +237,14 @@ public class TopicsManagerTest {
}
@Test
+ @FlakyTest(bugId = 302384321)
public void testTopicsManager_runOnDeviceClassifier_usingGetMethodToCreateManager()
throws Exception {
testTopicsManager_runOnDeviceClassifier(true);
}
@Test
+ @FlakyTest(bugId = 302384321)
public void testTopicsManager_runOnDeviceClassifier() throws Exception {
testTopicsManager_runOnDeviceClassifier(false);
}