diff options
| author | 2024-10-02 07:25:26 +0000 | |
|---|---|---|
| committer | 2024-10-02 07:25:26 +0000 | |
| commit | f87fc38d2fef0235c85c0a193113a4c7e17d21c1 (patch) | |
| tree | 1279b1e59afd9c1cc67711a69358b44a6f2b182a | |
| parent | 19c8d1306d9577341c7f1f6d32c6e42acdd40c66 (diff) | |
| parent | e726148a32e39968968f1e1a8f94bef2c4979640 (diff) | |
Merge "[PM] Add PackageInstaller CUJ test case (38/N)" into main
| -rw-r--r-- | core/java/android/content/pm/TEST_MAPPING | 22 | ||||
| -rw-r--r-- | packages/PackageInstaller/TEST_MAPPING | 22 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/TEST_MAPPING | 32 |
3 files changed, 76 insertions, 0 deletions
diff --git a/core/java/android/content/pm/TEST_MAPPING b/core/java/android/content/pm/TEST_MAPPING index 2cdae21bde92..44f2a4ca38e2 100644 --- a/core/java/android/content/pm/TEST_MAPPING +++ b/core/java/android/content/pm/TEST_MAPPING @@ -114,6 +114,17 @@ ] }, { + "name": "CtsPackageInstallerCUJDeviceAdminTestCases", + "options":[ + { + "exclude-annotation":"androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation":"org.junit.Ignore" + } + ] + }, + { "name": "CtsPackageInstallerCUJInstallationTestCases", "options":[ { @@ -125,6 +136,17 @@ ] }, { + "name": "CtsPackageInstallerCUJMultiUsersTestCases", + "options":[ + { + "exclude-annotation":"androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation":"org.junit.Ignore" + } + ] + }, + { "name": "CtsPackageInstallerCUJUninstallationTestCases", "options":[ { diff --git a/packages/PackageInstaller/TEST_MAPPING b/packages/PackageInstaller/TEST_MAPPING index 91882fde1537..50db5018d44e 100644 --- a/packages/PackageInstaller/TEST_MAPPING +++ b/packages/PackageInstaller/TEST_MAPPING @@ -1,6 +1,17 @@ { "presubmit": [ { + "name": "CtsPackageInstallerCUJDeviceAdminTestCases", + "options":[ + { + "exclude-annotation":"androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation":"org.junit.Ignore" + } + ] + }, + { "name": "CtsPackageInstallerCUJInstallationTestCases", "options":[ { @@ -12,6 +23,17 @@ ] }, { + "name": "CtsPackageInstallerCUJMultiUsersTestCases", + "options":[ + { + "exclude-annotation":"androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation":"org.junit.Ignore" + } + ] + }, + { "name": "CtsPackageInstallerCUJUninstallationTestCases", "options":[ { diff --git a/services/core/java/com/android/server/pm/TEST_MAPPING b/services/core/java/com/android/server/pm/TEST_MAPPING index 21a6df203015..94b49e538621 100644 --- a/services/core/java/com/android/server/pm/TEST_MAPPING +++ b/services/core/java/com/android/server/pm/TEST_MAPPING @@ -101,6 +101,22 @@ ] }, { + "name": "CtsPackageInstallerCUJDeviceAdminTestCases", + "file_patterns": [ + "core/java/.*Install.*", + "services/core/.*Install.*", + "services/core/java/com/android/server/pm/.*" + ], + "options":[ + { + "exclude-annotation":"androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation":"org.junit.Ignore" + } + ] + }, + { "name": "CtsPackageInstallerCUJInstallationTestCases", "file_patterns": [ "core/java/.*Install.*", @@ -117,6 +133,22 @@ ] }, { + "name": "CtsPackageInstallerCUJMultiUsersTestCases", + "file_patterns": [ + "core/java/.*Install.*", + "services/core/.*Install.*", + "services/core/java/com/android/server/pm/.*" + ], + "options":[ + { + "exclude-annotation":"androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation":"org.junit.Ignore" + } + ] + }, + { "name": "CtsPackageInstallerCUJUninstallationTestCases", "file_patterns": [ "core/java/.*Install.*", |