Merge "Honor org.junit.Ignore annotation." into rvc-dev am: 5855ce58e9

Change-Id: Icdea8648af314ebba12d6e1e29f2ff7ce371c3e2
2020-03-12 15:48:47 +00:00
parent 7b6ea4e8f1 5855ce58e9
commit 0bfc0d20bf
1 changed files with 6 additions and 0 deletions
--- a/packages/SystemUI/TEST_MAPPING
+++ b/packages/SystemUI/TEST_MAPPING
@@ -11,6 +11,9 @@
        {
            "include-annotation": "android.platform.test.scenario.annotation.Scenario"
        },
+        {
+            "exclude-annotation": "org.junit.Ignore"
+        },
        {
            "exclude-annotation": "androidx.test.filters.FlakyTest"
        }
@@ -27,6 +30,9 @@
        {
            "include-annotation": "android.platform.test.scenario.annotation.Scenario"
        },
+        {
+            "exclude-annotation": "org.junit.Ignore"
+        },
        {
            "exclude-annotation": "androidx.test.filters.FlakyTest"
        },