Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-08-30 22:17:56 +00:00
committed by Android (Google) Code Review
parent db496480ae 686504cdf0
commit 4da2952342
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/accessibility/TEST_MAPPING
View File

@@ -52,6 +52,9 @@
}, },
{ {
"exclude-annotation": "androidx.test.filters.FlakyTest" "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-annotation": "androidx.test.filters.FlakyTest"
},
{
"exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"
} }
] ]
} }

12
services/core/java/com/android/server/am/TEST_MAPPING
View File

@@ -14,6 +14,18 @@
}, },
{ {
"exclude-annotation": "androidx.test.filters.FlakyTest" "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"
} }
] ]
}, },