Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 686504cd authored by Ian Kasprzak's avatar Ian Kasprzak
Browse files

[DO NOT MERGE] Include exclude-rules in all TEST_MAPPING config instances. 

Due to b/117880789, when TEST_MAPPING configs merge for ATP testing
the exclusion rules get dropped unless their included everywhere.

BUG: 139535125
BUG: 117880789
BUG: 139536812

Test: Forrest
Exempt-From-Owner-Approval: Disabling known failing TEST_MAPPING tests
for AOSP push to Q.

Change-Id: I275cdb78c17c6d2edb02945a41704ae6e3730217
parent 07dfc766

services/accessibility/TEST_MAPPING

+6 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ 
        },

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        },

        {

          "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"

        }

      ]

    },
@@ -63,6 +66,9 @@ 
        },

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        },

        {

          "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"

        }

      ]

    }

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

+12 −0
Original line number Diff line number Diff line
@@ -14,6 +14,18 @@ 
        },

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        },

        {

          "exclude-filter": "android.app.cts.AlarmManagerTest#testSetRepeating"

        },

        {

          "exclude-filter": "android.app.cts.ServiceTest#testAppZygoteServices"

        },

        {

          "exclude-filter": "android.app.cts.SystemFeaturesTest#testLocationFeatures"

        },

        {

          "exclude-filter": "android.app.cts.SystemFeaturesTest#testSensorFeatures"

        }

      ]

    },