From e5bb5bd84ca40bbbe0e264b86ef15e12d996728f Mon Sep 17 00:00:00 2001 From: Anna Zhuravleva Date: Thu, 17 Aug 2023 15:04:01 +0000 Subject: Switch permission device tests to androidx flaky annotation. Platform_testing flaky annotation is for host side tests, device tests should use androidx annotation. Bug: 293837621 Test: presubmit Change-Id: If9f521ede3d9ecb065ede03554f9959e88a27ab7 --- PermissionController/TEST_MAPPING | 16 +++++----------- .../android/permissioncontroller/permission/TEST_MAPPING | 4 ++-- .../permissioncontroller/permission/service/TEST_MAPPING | 8 ++++---- .../permissioncontroller/permission/ui/TEST_MAPPING | 4 ++-- .../permissioncontroller/privacysources/TEST_MAPPING | 3 --- .../com/android/permissioncontroller/role/TEST_MAPPING | 4 ++-- .../permissioncontroller/safetylabel/TEST_MAPPING | 4 ++-- 7 files changed, 17 insertions(+), 26 deletions(-) (limited to 'PermissionController') diff --git a/PermissionController/TEST_MAPPING b/PermissionController/TEST_MAPPING index 869bb2020..a7f2aec54 100644 --- a/PermissionController/TEST_MAPPING +++ b/PermissionController/TEST_MAPPING @@ -8,9 +8,6 @@ "options": [ { "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" } ], "file_patterns": ["res/xml/roles\\.xml"] @@ -19,7 +16,7 @@ "name": "PermissionUiTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } @@ -29,7 +26,7 @@ "name": "CtsPermissionUiTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } @@ -46,10 +43,7 @@ "exclude-filter": "android.app.role.cts.RoleManagerTest#removeSmsRoleHolderThenPermissionIsRevoked" }, { - "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ], "file_patterns": ["res/xml/roles\\.xml"] @@ -58,7 +52,7 @@ "name": "PermissionUiTestCases[com.google.android.permission.apex]", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" }, // TODO(b/238773220): These tests currently fails on R base image { @@ -82,7 +76,7 @@ "name": "CtsPermissionUiTestCases[com.google.android.permission.apex]", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING index fa3b7ef78..38d46fe76 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING @@ -22,7 +22,7 @@ "include-filter": "android.permission.cts.PlatformPermissionGroupMappingTest" }, { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] }, @@ -58,7 +58,7 @@ "include-filter": "android.permission.cts.PlatformPermissionGroupMappingTest" }, { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] }, diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING index b71a85187..5dea9615a 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING @@ -4,7 +4,7 @@ "name": "CtsPermissionTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" }, { "include-filter": "android.permission.cts.PermissionControllerTest" @@ -18,7 +18,7 @@ "name": "CtsPermissionUiTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" }, { "include-filter": "android.permissionui.cts.SafetyLabelChangesJobServiceTest" @@ -29,7 +29,7 @@ "name": "CtsPermissionTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" }, { "include-filter": "android.permission.cts.LocationAccessCheckTest" @@ -65,7 +65,7 @@ "include-annotation": "com.android.cts.devicepolicy.annotations.PermissionsTest" }, { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING index 865ee6706..2a4953f51 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING @@ -7,7 +7,7 @@ "include-filter": "android.permission.cts.OneTimePermissionTest" }, { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } @@ -20,7 +20,7 @@ "include-annotation": "com.android.cts.devicepolicy.annotations.PermissionsTest" }, { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } diff --git a/PermissionController/src/com/android/permissioncontroller/privacysources/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/privacysources/TEST_MAPPING index d766ee080..3e8c5a19c 100644 --- a/PermissionController/src/com/android/permissioncontroller/privacysources/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/privacysources/TEST_MAPPING @@ -33,9 +33,6 @@ }, { "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" } ] } diff --git a/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING index a95df2fd5..01d04bea0 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING @@ -4,7 +4,7 @@ "name": "CtsRoleTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } @@ -21,7 +21,7 @@ "exclude-filter": "android.app.role.cts.RoleManagerTest#removeSmsRoleHolderThenPermissionIsRevoked" }, { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } diff --git a/PermissionController/src/com/android/permissioncontroller/safetylabel/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/safetylabel/TEST_MAPPING index 23c1398da..1503c5e57 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetylabel/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/safetylabel/TEST_MAPPING @@ -14,7 +14,7 @@ "name": "CtsPermissionUiTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } @@ -24,7 +24,7 @@ "name": "CtsPermissionUiTestCases[com.google.android.permission.apex]", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } -- cgit v1.2.3-59-g8ed1b