From 5989313dd3258ecf40c1a7b402b167351949dc05 Mon Sep 17 00:00:00 2001 From: Ronald Braunstein Date: Sat, 23 Mar 2024 15:23:26 -0700 Subject: Migrate TestMapping options to Android.bp Presubmit Now that the SLO checker has passed, move these to presubmit and remove the original entries that had options. Fixes: b/331020193 Test: CI https://android-build.corp.google.com/test_investigate/invocation/I94800010261847511/test/TR39329239330934307/?status=passing Test: atest --test-mapping src/com/android/server/contentcapture:presubmit Test: atest --test-mapping src/com/android/server/contentprotection:presubmit Test: atest --test-mapping src/com/android/server/location/contexthub:presubmit Test: atest --test-mapping src/com/android/server/om:presubmit Test: atest --test-mapping src/com/android/server/os:presubmit Test: atest --test-mapping src/com/android/server/recoverysystem:presubmit \# waiting on this one: atest --test-mapping src/com/android/server/pm:presubmit Change-Id: I2e7000482f7f4d95c38abff67d93278d027b2d8b --- .../com/android/server/contentcapture/TEST_MAPPING | 17 -------------- .../android/server/contentprotection/TEST_MAPPING | 17 -------------- .../server/location/contexthub/TEST_MAPPING | 20 +---------------- .../src/com/android/server/om/TEST_MAPPING | 13 +---------- .../src/com/android/server/os/TEST_MAPPING | 11 --------- .../src/com/android/server/pm/TEST_MAPPING | 2 +- .../com/android/server/recoverysystem/TEST_MAPPING | 26 +++++----------------- 7 files changed, 9 insertions(+), 97 deletions(-) diff --git a/services/tests/servicestests/src/com/android/server/contentcapture/TEST_MAPPING b/services/tests/servicestests/src/com/android/server/contentcapture/TEST_MAPPING index dae8f932cb91..09462290fb4f 100644 --- a/services/tests/servicestests/src/com/android/server/contentcapture/TEST_MAPPING +++ b/services/tests/servicestests/src/com/android/server/contentcapture/TEST_MAPPING @@ -1,23 +1,6 @@ { "presubmit": [ { - "name": "FrameworksServicesTests", - "options": [ - { - "include-filter": "com.android.server.contentcapture" - }, - { - "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "exclude-annotation": "org.junit.Ignore" - } - ] - } - ], - "postsubmit": [ - { - // b/331020193, Move to presubmit early april 2024 "name": "FrameworksServicesTests_contentcapture" } ] diff --git a/services/tests/servicestests/src/com/android/server/contentprotection/TEST_MAPPING b/services/tests/servicestests/src/com/android/server/contentprotection/TEST_MAPPING index 32729a899a96..1ad7baa09529 100644 --- a/services/tests/servicestests/src/com/android/server/contentprotection/TEST_MAPPING +++ b/services/tests/servicestests/src/com/android/server/contentprotection/TEST_MAPPING @@ -1,23 +1,6 @@ { "presubmit": [ { - "name": "FrameworksServicesTests", - "options": [ - { - "include-filter": "com.android.server.contentprotection" - }, - { - "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "exclude-annotation": "org.junit.Ignore" - } - ] - } - ], - "postsubmit": [ - { - // b/331020193, Move to presubmit early april 2024 "name": "FrameworksServicesTests_contentprotection" } ] diff --git a/services/tests/servicestests/src/com/android/server/location/contexthub/TEST_MAPPING b/services/tests/servicestests/src/com/android/server/location/contexthub/TEST_MAPPING index dc8f934ff9e5..58f5bb3eb7d0 100644 --- a/services/tests/servicestests/src/com/android/server/location/contexthub/TEST_MAPPING +++ b/services/tests/servicestests/src/com/android/server/location/contexthub/TEST_MAPPING @@ -1,28 +1,10 @@ { "presubmit": [ { - "name": "FrameworksServicesTests", - "options": [ - { - "include-filter": "com.android.server.location.contexthub." - }, - { - "include-annotation": "android.platform.test.annotations.Presubmit" - }, - { - "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "exclude-annotation": "org.junit.Ignore" - } - ] + "name": "FrameworksServicesTests_contexthub_presubmit" } ], "postsubmit": [ - { - // b/331020193, Move to presubmit early april 2024 - "name": "FrameworksServicesTests_contexthub_presubmit" - }, { "name": "FrameworksServicesTests", "options": [ diff --git a/services/tests/servicestests/src/com/android/server/om/TEST_MAPPING b/services/tests/servicestests/src/com/android/server/om/TEST_MAPPING index 41c4383a0bec..944c1df94b92 100644 --- a/services/tests/servicestests/src/com/android/server/om/TEST_MAPPING +++ b/services/tests/servicestests/src/com/android/server/om/TEST_MAPPING @@ -1,12 +1,7 @@ { "presubmit": [ { - "name": "FrameworksServicesTests", - "options": [ - { - "include-filter": "com.android.server.om." - } - ] + "name": "FrameworksServicesTests_om" }, { "name": "PackageManagerServiceHostTests", @@ -16,11 +11,5 @@ } ] } - ], - "postsubmit": [ - { - // b/331020193, Move to presubmit early april 2024 - "name": "FrameworksServicesTests_om" - } ] } diff --git a/services/tests/servicestests/src/com/android/server/os/TEST_MAPPING b/services/tests/servicestests/src/com/android/server/os/TEST_MAPPING index 06e7002924a7..2138da9478d7 100644 --- a/services/tests/servicestests/src/com/android/server/os/TEST_MAPPING +++ b/services/tests/servicestests/src/com/android/server/os/TEST_MAPPING @@ -1,17 +1,6 @@ { "presubmit": [ { - "name": "FrameworksServicesTests", - "options": [ - { - "include-filter": "com.android.server.os." - } - ] - } - ], - "postsubmit": [ - { - // b/331020193, Move to presubmit early april 2024 "name": "FrameworksServicesTests_os" } ] diff --git a/services/tests/servicestests/src/com/android/server/pm/TEST_MAPPING b/services/tests/servicestests/src/com/android/server/pm/TEST_MAPPING index f4e724f493c5..861562d11f10 100644 --- a/services/tests/servicestests/src/com/android/server/pm/TEST_MAPPING +++ b/services/tests/servicestests/src/com/android/server/pm/TEST_MAPPING @@ -21,7 +21,7 @@ "postsubmit": [ { // Presubmit is intentional here while testing with SLO checker. - // b/331020193, Move to presubmit early april 2024 + // Tests are flaky, waiting to bypass. "name": "FrameworksServicesTests_pm_presubmit" }, { diff --git a/services/tests/servicestests/src/com/android/server/recoverysystem/TEST_MAPPING b/services/tests/servicestests/src/com/android/server/recoverysystem/TEST_MAPPING index 7e7393c3a822..eb7453d5b86a 100644 --- a/services/tests/servicestests/src/com/android/server/recoverysystem/TEST_MAPPING +++ b/services/tests/servicestests/src/com/android/server/recoverysystem/TEST_MAPPING @@ -1,21 +1,7 @@ { - "presubmit": [ - { - "name": "FrameworksServicesTests", - "options": [ - { - "include-filter": "com.android.server.recoverysystem." - }, - { - "exclude-annotation": "androidx.test.filters.FlakyTest" - } - ] - } - ], - "postsubmit": [ - { - // b/331020193, Move to presubmit early april 2024 - "name": "FrameworksServicesTests_recoverysystem" - } - ] -} \ No newline at end of file + "presubmit": [ + { + "name": "FrameworksServicesTests_recoverysystem" + } + ] +} -- cgit v1.2.3-59-g8ed1b