commit 2ff3f0bbd7c28b1ed04ef271d8dac52818d1a01c
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 22 03:50:27 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 22 03:50:27 2019 +0000
tree 0ad58c801f7158a44458a621d1af203a833d3c34
parent 9fe545b601eb2b02375b8dc23cb7d8a5181603f2
parent 9097e33940f0ffbd6528074e882c21bee05d0134

Merge "Mark UI tests as flaky and restore role tests for presubmit."

services/core/java/com/android/server/role/TEST_MAPPING

diff --git a/services/core/java/com/android/server/role/TEST_MAPPING b/services/core/java/com/android/server/role/TEST_MAPPING
index 0b967be..0d7bc14 100644
--- a/services/core/java/com/android/server/role/TEST_MAPPING
+++ b/services/core/java/com/android/server/role/TEST_MAPPING
@@ -7,11 +7,14 @@
                     "include-filter": "android.cts.statsd.atom.UidAtomTests#testRoleHolder"
                 }
             ]
-        }
-    ],
-    "postsubmit": [
+        },
         {
-            "name": "CtsRoleTestCases"
+            "name": "CtsRoleTestCases",
+            "options": [
+                {
+                    "exclude-annotation": "androidx.test.filters.FlakyTest"
+                }
+            ]
         }
     ]
 }