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

Merge "Only run flaky permissions test in postsubmit (frameworks/base)" into main

Browse Source
This commit is contained in:
Jay Sullivan
2023-07-23 19:22:41 +00:00
committed by Android (Google) Code Review
parent 09d77832e0 86d4819f9a
commit 7f385ed59f
6 changed files with 142 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/app/TEST_MAPPING
View File

@@ -16,7 +16,12 @@
},
{
"file_patterns": ["(/|^)AppOpsManager.java"],
"name": "CtsAppOpsTestCases"
"name": "CtsAppOpsTestCases",
"options": [
{
"exclude-annotation": "android.platform.test.annotations.FlakyTest"
}
]
},
{
"file_patterns": ["(/|^)AppOpsManager.java"],
@@ -263,6 +268,10 @@
{
"file_patterns": ["(/|^)ActivityThreadTest.java"],
"name": "FrameworksCoreTests"
},
{
"file_patterns": ["(/|^)AppOpsManager.java"],
"name": "CtsAppOpsTestCases"
}
]
}

13
packages/SystemUI/TEST_MAPPING
View File

@@ -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",

32
services/core/java/com/android/server/appop/TEST_MAPPING
View File

@@ -1,7 +1,12 @@
{
"presubmit": [
{
"name": "CtsAppOpsTestCases"
"name": "CtsAppOpsTestCases",
"options": [
{
"exclude-annotation": "android.platform.test.annotations.FlakyTest"
}
]
},
{
"name": "CtsAppOps2TestCases"
@@ -25,6 +30,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"
}
]
}
]
}

29
services/core/java/com/android/server/pm/permission/TEST_MAPPING
View File

@@ -3,6 +3,9 @@
{
"name": "CtsPermissionTestCases",
"options": [
{
"exclude-annotation": "android.platform.test.annotations.FlakyTest"
},
{
"include-filter": "android.permission.cts.BackgroundPermissionsTest"
},
@@ -28,6 +31,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"
}
]
}

31
services/core/java/com/android/server/policy/TEST_MAPPING
View File

@@ -31,6 +31,9 @@
{
"name": "CtsPermissionPolicyTestCases",
"options": [
{
"exclude-annotation": "android.platform.test.annotations.FlakyTest"
},
{
"include-filter": "android.permissionpolicy.cts.RestrictedPermissionsTest"
},
@@ -45,6 +48,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"
}
]
}
]
}

29
services/permission/TEST_MAPPING
View File

@@ -3,6 +3,9 @@
{
"name": "CtsPermissionTestCases",
"options": [
{
"exclude-annotation": "android.platform.test.annotations.FlakyTest"
},
{
"include-filter": "android.permission.cts.BackgroundPermissionsTest"
},
@@ -28,6 +31,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"
}
]
}