From 92f9817b0cb46cae6663d6795b30fd5ac0b1694c Mon Sep 17 00:00:00 2001 From: Diwas Sharma Date: Fri, 19 Apr 2024 00:23:55 +0000 Subject: Add a dedicated Mainline Test Mapping group for PermissionController Test of *all* Mainline modules are currently configured in a single `mainline-presubmit` Test Mapping group. This requires that users indicate the module to install in every entry and is quite tedious. The above approach also adds overhead due to installing, checking for, and uninstalling Mainline modules between test module executions. This eats up precious presubmit time and gets runtimes close to violating the SLO. This change moves all PermissionController Mainline module tests into a dedicated Test Mapping group that installs the Mainline module once before executing all test modules. This also simplifies the configuration syntax by no longer requiring brackets that indicate the, now implicit, Mainline module. Bug: 328102821 Test: presubmit checks Change-Id: Id7abaaa4096a4afe2175e79e629f59e84588dda4 --- framework-s/java/android/app/role/TEST_MAPPING | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'framework-s/java') diff --git a/framework-s/java/android/app/role/TEST_MAPPING b/framework-s/java/android/app/role/TEST_MAPPING index 01d04bea0..46b148e68 100644 --- a/framework-s/java/android/app/role/TEST_MAPPING +++ b/framework-s/java/android/app/role/TEST_MAPPING @@ -26,6 +26,23 @@ ] } ], + "permission-mainline-presubmit": [ + { + "name": "CtsRoleTestCases", + "options": [ + // TODO(b/238677748): These two tests currently fails on R base image + { + "exclude-filter": "android.app.role.cts.RoleManagerTest#openDefaultAppListThenIsNotDefaultAppInList" + }, + { + "exclude-filter": "android.app.role.cts.RoleManagerTest#removeSmsRoleHolderThenPermissionIsRevoked" + }, + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + } + ] + } + ], "postsubmit": [ { "name": "CtsRoleTestCases" -- cgit v1.2.3-59-g8ed1b