diff options
| author | 2022-11-23 20:40:38 +0000 | |
|---|---|---|
| committer | 2022-12-07 21:52:46 +0000 | |
| commit | 0cadcd164823430893097e6cb1e7dce0dd2f3914 (patch) | |
| tree | b1c8050be68d55eceeceb25857bfddb07d44c5ab | |
| parent | b8859a205529670a8a2cf94e5acf46f022bc939f (diff) | |
Cleanup after test suite split.
Bug: 238141698
Bug: 261478099
Test: presubmit
Change-Id: I3d99829a735bc09b52ef77d75d875ca547d53f01
Merged-In: I3d99829a735bc09b52ef77d75d875ca547d53f01
| -rw-r--r-- | TEST_MAPPING | 30 | ||||
| -rw-r--r-- | services/tests/servicestests/Android.bp | 1 |
2 files changed, 30 insertions, 1 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING index e178583bca78..a48ce0ce1b6c 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -15,6 +15,22 @@ ] } ], + "presubmit-pm": [ + { + "name": "PackageManagerServiceServerTests", + "options": [ + { + "include-annotation": "android.platform.test.annotations.Presubmit" + }, + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation": "org.junit.Ignore" + } + ] + } + ], "presubmit": [ { "name": "ManagedProvisioningTests", @@ -167,6 +183,20 @@ "exclude-annotation": "org.junit.Ignore" } ] + }, + { + "name": "PackageManagerServiceServerTests", + "options": [ + { + "include-annotation": "android.platform.test.annotations.Presubmit" + }, + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation": "org.junit.Ignore" + } + ] } ] } diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index c48ae58d52e2..d622a8032485 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -55,7 +55,6 @@ android_test { "hamcrest-library", "servicestests-utils", "service-jobscheduler", - "service-permission.impl", // TODO: remove once Android migrates to JUnit 4.12, // which provides assertThrows "testng", |