From b7833028438d1a7ccd86a9a1e3480cc81fc4c389 Mon Sep 17 00:00:00 2001
From: Alex Buynytskyy <alexbuy@google.com>
Date: Wed, 23 Nov 2022 20:40:38 +0000
Subject: [PATCH] Cleanup after test suite split.
Bug: 238141698
Bug: 262254794
Test: presubmit
Change-Id: I3d99829a735bc09b52ef77d75d875ca547d53f01
Merged-In: I3d99829a735bc09b52ef77d75d875ca547d53f01
---
TEST_MAPPING | 30 +++++++++++++++++++++++++
services/tests/servicestests/Android.bp | 1 -
2 files changed, 30 insertions(+), 1 deletion(-)
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",
--
GitLab