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

Merge "Exclude flaky tests from presubmit." into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-25 14:47:51 +00:00
committed by Android (Google) Code Review
parent 040c89290b ce3a57e8b5
commit 3fe54949f8
5 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apex/jobscheduler/service/java/com/android/server/TEST_MAPPING
View File

@@ -7,6 +7,7 @@
], ],
"options": [ "options": [
{"include-filter": "com.android.server.DeviceIdleControllerTest"}, {"include-filter": "com.android.server.DeviceIdleControllerTest"},
{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
{"exclude-annotation": "androidx.test.filters.FlakyTest"} {"exclude-annotation": "androidx.test.filters.FlakyTest"}
] ]
} }

1
apex/jobscheduler/service/java/com/android/server/deviceidle/TEST_MAPPING
View File

@@ -4,6 +4,7 @@
"name": "FrameworksMockingServicesTests", "name": "FrameworksMockingServicesTests",
"options": [ "options": [
{"include-filter": "com.android.server.DeviceIdleControllerTest"}, {"include-filter": "com.android.server.DeviceIdleControllerTest"},
{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
{"exclude-annotation": "androidx.test.filters.FlakyTest"} {"exclude-annotation": "androidx.test.filters.FlakyTest"}
] ]
} }

3
apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING
View File

@@ -3,6 +3,7 @@
{ {
"name": "CtsJobSchedulerTestCases", "name": "CtsJobSchedulerTestCases",
"options": [ "options": [
{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
{"exclude-annotation": "androidx.test.filters.FlakyTest"}, {"exclude-annotation": "androidx.test.filters.FlakyTest"},
{"exclude-annotation": "androidx.test.filters.LargeTest"} {"exclude-annotation": "androidx.test.filters.LargeTest"}
] ]
@@ -11,6 +12,7 @@
"name": "FrameworksMockingServicesTests", "name": "FrameworksMockingServicesTests",
"options": [ "options": [
{"include-filter": "com.android.server.job"}, {"include-filter": "com.android.server.job"},
{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
{"exclude-annotation": "androidx.test.filters.FlakyTest"} {"exclude-annotation": "androidx.test.filters.FlakyTest"}
] ]
}, },
@@ -18,6 +20,7 @@
"name": "FrameworksServicesTests", "name": "FrameworksServicesTests",
"options": [ "options": [
{"include-filter": "com.android.server.job"}, {"include-filter": "com.android.server.job"},
{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
{"exclude-annotation": "androidx.test.filters.FlakyTest"} {"exclude-annotation": "androidx.test.filters.FlakyTest"}
] ]
} }

2
apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING
View File

@@ -4,6 +4,7 @@
"name": "CtsUsageStatsTestCases", "name": "CtsUsageStatsTestCases",
"options": [ "options": [
{"include-filter": "android.app.usage.cts.UsageStatsTest"}, {"include-filter": "android.app.usage.cts.UsageStatsTest"},
{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
{"exclude-annotation": "androidx.test.filters.FlakyTest"} {"exclude-annotation": "androidx.test.filters.FlakyTest"}
] ]
}, },
@@ -11,6 +12,7 @@
"name": "FrameworksServicesTests", "name": "FrameworksServicesTests",
"options": [ "options": [
{"include-filter": "com.android.server.usage"}, {"include-filter": "com.android.server.usage"},
{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
{"exclude-annotation": "androidx.test.filters.FlakyTest"} {"exclude-annotation": "androidx.test.filters.FlakyTest"}
] ]
} }

3
services/core/java/com/android/server/power/TEST_MAPPING
View File

@@ -3,6 +3,7 @@
{ {
"name": "CtsBatterySavingTestCases", "name": "CtsBatterySavingTestCases",
"options": [ "options": [
{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
{"exclude-annotation": "androidx.test.filters.LargeTest"}, {"exclude-annotation": "androidx.test.filters.LargeTest"},
{"exclude-annotation": "androidx.test.filters.FlakyTest"} {"exclude-annotation": "androidx.test.filters.FlakyTest"}
] ]
@@ -11,6 +12,7 @@
"name": "FrameworksMockingServicesTests", "name": "FrameworksMockingServicesTests",
"options": [ "options": [
{"include-filter": "com.android.server.power"}, {"include-filter": "com.android.server.power"},
{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
{"exclude-annotation": "androidx.test.filters.FlakyTest"} {"exclude-annotation": "androidx.test.filters.FlakyTest"}
] ]
}, },
@@ -18,6 +20,7 @@
"name": "FrameworksServicesTests", "name": "FrameworksServicesTests",
"options": [ "options": [
{"include-filter": "com.android.server.power"}, {"include-filter": "com.android.server.power"},
{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
{"exclude-annotation": "androidx.test.filters.FlakyTest"}, {"exclude-annotation": "androidx.test.filters.FlakyTest"},
{ {
"exclude-filter": "com.android.server.power.PowerManagerServiceTest#testWakefulnessAwake_ShouldWakeUpWhenPluggedIn" "exclude-filter": "com.android.server.power.PowerManagerServiceTest#testWakefulnessAwake_ShouldWakeUpWhenPluggedIn"