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

Commit 4da29523 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

Merge "[DO NOT MERGE] Include exclude-rules in all TEST_MAPPING config instances." into stage-aosp-master
parents db496480 686504cd

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"

        }

      ]

    },