Only run flaky permissions test in postsubmit (frameworks/base)
Certain tests in these test modules have a flake rate higher than 0.5%,
which means they are out-of-SLO for Project Ironwood. We've marked them
as @FlakyTest (in a separate change). But, in this change, we also
update the TEST_MAPPING files so that don't run any flaky tests
(i.e., annotated with @FlakyTest) in presubmit, but do run them in
postsubmit.
Test: Verify tests do not run in presubmit, but do in postsubmit
Bug: 290240321
Change-Id: Ia679980a0d8aa7bc9266a3f624ff7279c19a46b3
diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING
index bc5f7f4..7da8920 100644
--- a/core/java/android/app/TEST_MAPPING
+++ b/core/java/android/app/TEST_MAPPING
@@ -16,7 +16,12 @@
},
{
"file_patterns": ["(/|^)AppOpsManager.java"],
- "name": "CtsAppOpsTestCases"
+ "name": "CtsAppOpsTestCases",
+ "options": [
+ {
+ "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+ }
+ ]
},
{
"file_patterns": ["(/|^)AppOpsManager.java"],
@@ -265,6 +270,10 @@
{
"file_patterns": ["(/|^)ActivityThreadTest.java"],
"name": "FrameworksCoreTests"
+ },
+ {
+ "file_patterns": ["(/|^)AppOpsManager.java"],
+ "name": "CtsAppOpsTestCases"
}
]
}
diff --git a/packages/SystemUI/TEST_MAPPING b/packages/SystemUI/TEST_MAPPING
index 7a5a382..c59b0f9 100644
--- a/packages/SystemUI/TEST_MAPPING
+++ b/packages/SystemUI/TEST_MAPPING
@@ -72,7 +72,7 @@
"exclude-annotation": "org.junit.Ignore"
},
{
- "exclude-annotation": "androidx.test.filters.FlakyTest"
+ "exclude-annotation": "android.platform.test.annotations.FlakyTest"
},
{
"include-filter": "android.permissionui.cts.CameraMicIndicatorsPermissionTest"
@@ -110,6 +110,17 @@
]
}
],
+ "postsubmit": [
+ {
+ // Permission indicators
+ "name": "CtsPermissionUiTestCases",
+ "options": [
+ {
+ "include-filter": "android.permissionui.cts.CameraMicIndicatorsPermissionTest"
+ }
+ ]
+ }
+ ],
"silver-sysui": [
{
"name": "PlatformScenarioTests",
diff --git a/services/core/java/com/android/server/appop/TEST_MAPPING b/services/core/java/com/android/server/appop/TEST_MAPPING
index 72d3835..68062b5 100644
--- a/services/core/java/com/android/server/appop/TEST_MAPPING
+++ b/services/core/java/com/android/server/appop/TEST_MAPPING
@@ -1,7 +1,12 @@
{
"presubmit": [
{
- "name": "CtsAppOpsTestCases"
+ "name": "CtsAppOpsTestCases",
+ "options": [
+ {
+ "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+ }
+ ]
},
{
"name": "CtsAppOps2TestCases"
@@ -26,6 +31,9 @@
"name": "CtsPermissionTestCases",
"options": [
{
+ "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+ },
+ {
"include-filter": "android.permission.cts.BackgroundPermissionsTest"
},
{
@@ -55,5 +63,27 @@
}
]
}
+ ],
+ "postsubmit": [
+ {
+ "name": "CtsAppOpsTestCases"
+ },
+ {
+ "name": "CtsPermissionTestCases",
+ "options": [
+ {
+ "include-filter": "android.permission.cts.BackgroundPermissionsTest"
+ },
+ {
+ "include-filter": "android.permission.cts.SplitPermissionTest"
+ },
+ {
+ "include-filter": "android.permission.cts.PermissionFlagsTest"
+ },
+ {
+ "include-filter": "android.permission.cts.SharedUidPermissionsTest"
+ }
+ ]
+ }
]
}
diff --git a/services/core/java/com/android/server/pm/permission/TEST_MAPPING b/services/core/java/com/android/server/pm/permission/TEST_MAPPING
index 579d4e3..b2dcf37 100644
--- a/services/core/java/com/android/server/pm/permission/TEST_MAPPING
+++ b/services/core/java/com/android/server/pm/permission/TEST_MAPPING
@@ -4,6 +4,9 @@
"name": "CtsPermissionTestCases",
"options": [
{
+ "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+ },
+ {
"include-filter": "android.permission.cts.BackgroundPermissionsTest"
},
{
@@ -29,6 +32,9 @@
"name": "CtsPermissionPolicyTestCases",
"options": [
{
+ "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+ },
+ {
"include-filter": "android.permissionpolicy.cts.RestrictedPermissionsTest"
},
{
@@ -59,6 +65,29 @@
"options": [
{
"include-filter": "android.permission.cts.PermissionUpdateListenerTest"
+ },
+ {
+ "include-filter": "android.permission.cts.BackgroundPermissionsTest"
+ },
+ {
+ "include-filter": "android.permission.cts.SplitPermissionTest"
+ },
+ {
+ "include-filter": "android.permission.cts.PermissionFlagsTest"
+ },
+ {
+ "include-filter": "android.permission.cts.SharedUidPermissionsTest"
+ }
+ ]
+ },
+ {
+ "name": "CtsPermissionPolicyTestCases",
+ "options": [
+ {
+ "include-filter": "android.permissionpolicy.cts.RestrictedPermissionsTest"
+ },
+ {
+ "include-filter": "android.permission.cts.PermissionMaxSdkVersionTest"
}
]
}
diff --git a/services/core/java/com/android/server/policy/TEST_MAPPING b/services/core/java/com/android/server/policy/TEST_MAPPING
index 9f1cb1a..819a82c 100644
--- a/services/core/java/com/android/server/policy/TEST_MAPPING
+++ b/services/core/java/com/android/server/policy/TEST_MAPPING
@@ -32,6 +32,9 @@
"name": "CtsPermissionPolicyTestCases",
"options": [
{
+ "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+ },
+ {
"include-filter": "android.permissionpolicy.cts.RestrictedPermissionsTest"
},
{
@@ -46,6 +49,9 @@
"name": "CtsPermissionTestCases",
"options": [
{
+ "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+ },
+ {
"include-filter": "android.permission.cts.SplitPermissionTest"
},
{
@@ -78,6 +84,31 @@
"include-filter": "com.android.server.policy."
}
]
+ },
+ {
+ "name": "CtsPermissionPolicyTestCases",
+ "options": [
+ {
+ "include-filter": "android.permissionpolicy.cts.RestrictedPermissionsTest"
+ },
+ {
+ "include-filter": "android.permissionpolicy.cts.RestrictedStoragePermissionSharedUidTest"
+ },
+ {
+ "include-filter": "android.permissionpolicy.cts.RestrictedStoragePermissionTest"
+ }
+ ]
+ },
+ {
+ "name": "CtsPermissionTestCases",
+ "options": [
+ {
+ "include-filter": "android.permission.cts.SplitPermissionTest"
+ },
+ {
+ "include-filter": "android.permission.cts.BackgroundPermissionsTest"
+ }
+ ]
}
]
}
diff --git a/services/permission/TEST_MAPPING b/services/permission/TEST_MAPPING
index 579d4e3..b2dcf37 100644
--- a/services/permission/TEST_MAPPING
+++ b/services/permission/TEST_MAPPING
@@ -4,6 +4,9 @@
"name": "CtsPermissionTestCases",
"options": [
{
+ "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+ },
+ {
"include-filter": "android.permission.cts.BackgroundPermissionsTest"
},
{
@@ -29,6 +32,9 @@
"name": "CtsPermissionPolicyTestCases",
"options": [
{
+ "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+ },
+ {
"include-filter": "android.permissionpolicy.cts.RestrictedPermissionsTest"
},
{
@@ -59,6 +65,29 @@
"options": [
{
"include-filter": "android.permission.cts.PermissionUpdateListenerTest"
+ },
+ {
+ "include-filter": "android.permission.cts.BackgroundPermissionsTest"
+ },
+ {
+ "include-filter": "android.permission.cts.SplitPermissionTest"
+ },
+ {
+ "include-filter": "android.permission.cts.PermissionFlagsTest"
+ },
+ {
+ "include-filter": "android.permission.cts.SharedUidPermissionsTest"
+ }
+ ]
+ },
+ {
+ "name": "CtsPermissionPolicyTestCases",
+ "options": [
+ {
+ "include-filter": "android.permissionpolicy.cts.RestrictedPermissionsTest"
+ },
+ {
+ "include-filter": "android.permission.cts.PermissionMaxSdkVersionTest"
}
]
}
