From 33cecbe136223a1bca408ffe7ffbfc65a24d5934 Mon Sep 17 00:00:00 2001
From: Michael Wright <michaelwr@google.com>
Date: Wed, 6 Jul 2022 20:01:37 +0100
Subject: Mark testNotificationEvent_quotaBump as flaky.

It currently is failing > 50% of the time on master.

Also, actually configure the test runners to actually skip flaky tests.
Most of these were still running despite being marked as @FlakyTest.

Bug: 185169504
Test: atest AppStandbyControllerTests#testNotificationEvent_quotaBump
Change-Id: I587f156a7296c80dd0d55fd9687de6bdcabb3895
(cherry picked from commit eedfcc8aca5ec80b852426fe3c89e3a3c69b530c)
---
 services/tests/servicestests/AndroidTest.xml                             | 1 +
 .../src/com/android/server/usage/AppStandbyControllerTests.java          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/services/tests/servicestests/AndroidTest.xml b/services/tests/servicestests/AndroidTest.xml
index 158bd39a4fd0..7092092fef25 100644
--- a/services/tests/servicestests/AndroidTest.xml
+++ b/services/tests/servicestests/AndroidTest.xml
@@ -50,5 +50,6 @@
         <option name="package" value="com.android.frameworks.servicestests" />
         <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
         <option name="hidden-api-checks" value="false"/>
+        <option name="exclude-annotation" value="androidx.test.filters.FlakyTest" />
     </test>
 </configuration>
diff --git a/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java b/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java
index 82945b9e932a..e2db7584a2a6 100644
--- a/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java
+++ b/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java
@@ -931,6 +931,7 @@ public class AppStandbyControllerTests {
     }
 
     @Test
+    @FlakyTest(bugId = 185169504)
     public void testNotificationEvent_quotaBump() throws Exception {
         mInjector.mSettingsBuilder
                 .setBoolean("trigger_quota_bump_on_notification_seen", true);
-- 
cgit v1.2.3-59-g8ed1b