Snap for 11383711 from 80f6262c81c711ef2d43af1283c55c71e85d8446 to mainline-ipsec-release
Change-Id: Ied2cf735a5a42331a5366db0bc27df8686372ae7
diff --git a/tools/mts-tradefed/res/config/mts-adservices-tests-list.xml b/tools/mts-tradefed/res/config/mts-adservices-tests-list.xml
index 99e2545..1e8ec81 100644
--- a/tools/mts-tradefed/res/config/mts-adservices-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-adservices-tests-list.xml
@@ -23,6 +23,7 @@
<option name="compatibility:include-filter" value="AdServicesMddIntegrationTests" />
<option name="compatibility:include-filter" value="AdServicesServiceCoreUnitTests" />
<option name="compatibility:include-filter" value="AdServicesServiceCoreMeasurementUnitTests" />
+ <option name="compatibility:include-filter" value="AdServicesServiceCoreTopicsUnitTests" />
<option name="compatibility:include-filter" value="CtsAdIdEndToEndTest" />
<option name="compatibility:include-filter" value="CtsAdServicesDebuggableDeviceTestCases" />
<option name="compatibility:include-filter" value="CtsAdServicesDeviceTestCases" />
@@ -63,6 +64,7 @@
<option name="compatibility:module-arg" value="AdServicesMddIntegrationTests:enable:true" />
<option name="compatibility:module-arg" value="AdServicesServiceCoreUnitTests:enable:true" />
<option name="compatibility:module-arg" value="AdServicesServiceCoreMeasurementUnitTests:enable:true" />
+ <option name="compatibility:module-arg" value="AdServicesServiceCoreTopicsUnitTests:enable:true" />
<option name="compatibility:module-arg" value="CtsAdIdEndToEndTest:enable:true" />
<option name="compatibility:module-arg" value="CtsAdServicesDebuggableDeviceTestCases:enable:true" />
<option name="compatibility:module-arg" value="CtsAdServicesDeviceTestCases:enable:true" />
diff --git a/tools/mts-tradefed/res/config/mts-extservices-tests-list-eng-only.xml b/tools/mts-tradefed/res/config/mts-extservices-tests-list-eng-only.xml
new file mode 100644
index 0000000..60e6091
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-extservices-tests-list-eng-only.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="List mts tests that need root access.">
+ <!-- for AdServices -->
+ <option name="compatibility:include-filter" value="AdExtServicesGaUxAlreadyEnrolledChannelRowTest" />
+ <option name="compatibility:include-filter" value="AdExtServicesGaUxAlreadyEnrolledChannelEuTest" />
+ <option name="compatibility:include-filter" value="AdExtServicesGaUxDebugChannelEuTest" />
+ <option name="compatibility:include-filter" value="AdExtServicesGaUxDebugChannelRowTest" />
+ <option name="compatibility:include-filter" value="AdExtServicesGaUxDebugChannelApiOffTest" />
+ <option name="compatibility:include-filter" value="AdExtServicesGaUxGraduationChannelRowTest" />
+
+ <!-- Enable MainlineTestModuleController. -->
+ <option name="compatibility:module-arg" value="AdExtServicesGaUxAlreadyEnrolledChannelRowTest:enable:true" />
+ <option name="compatibility:module-arg" value="AdExtServicesGaUxAlreadyEnrolledChannelEuTest:enable:true" />
+ <option name="compatibility:module-arg" value="AdExtServicesGaUxDebugChannelEuTest:enable:true" />
+ <option name="compatibility:module-arg" value="AdExtServicesGaUxDebugChannelRowTest:enable:true" />
+ <option name="compatibility:module-arg" value="AdExtServicesGaUxDebugChannelApiOffTest:enable:true" />
+ <option name="compatibility:module-arg" value="AdExtServicesGaUxGraduationChannelRowTest:enable:true" />
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-extservices-tests-list.xml b/tools/mts-tradefed/res/config/mts-extservices-tests-list-user.xml
similarity index 100%
rename from tools/mts-tradefed/res/config/mts-extservices-tests-list.xml
rename to tools/mts-tradefed/res/config/mts-extservices-tests-list-user.xml
diff --git a/tools/mts-tradefed/res/config/mts-extservices.xml b/tools/mts-tradefed/res/config/mts-extservices.xml
index 6af6963..f8ebc1f 100644
--- a/tools/mts-tradefed/res/config/mts-extservices.xml
+++ b/tools/mts-tradefed/res/config/mts-extservices.xml
@@ -17,7 +17,8 @@
<include name="mts" />
- <include name="mts-extservices-tests-list" />
+ <include name="mts-extservices-tests-list-eng-only" />
+ <include name="mts-extservices-tests-list-user" />
<option name="plan" value="mts-extservices" />
diff --git a/tools/mts-tradefed/res/config/mts-healthfitness-no-unittests-tests-list.xml b/tools/mts-tradefed/res/config/mts-healthfitness-no-unittests-tests-list.xml
new file mode 100644
index 0000000..a656415
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-healthfitness-no-unittests-tests-list.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 The Android Open Source Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<configuration description="List test modules of HealthFitness module excluding unit tests. This is a placeholder xml instead of a runnable plan.">
+ <option name="compatibility:include-filter" value="CtsHealthFitnessDeviceTestCases" />
+ <option name="compatibility:include-filter" value="CtsHealthFitnessDeviceTestCasesNoPermission"/>
+ <option name="compatibility:include-filter" value="CtsHealthConnectControllerTestCases" />
+ <option name="compatibility:include-filter" value="HealthFitnessIntegrationTests" />
+ <option name="compatibility:include-filter" value="CtsHealthFitnessDeviceTestCasesRateLimiter"/>
+ <option name="compatibility:include-filter" value="CtsHealthFitnessShowMigrationInfoIntentAbsentTests"/>
+ <option name="compatibility:include-filter" value="HealthFitnessIntegrationBackupRestoreTests"/>
+
+ <option name="compatibility:module-arg" value="CtsHealthFitnessDeviceTestCases:enable:true" />
+ <option name="compatibility:module-arg" value="CtsHealthFitnessDeviceTestCasesNoPermission:enable:true" />
+ <option name="compatibility:module-arg" value="CtsHealthConnectControllerTestCases:enable:true" />
+ <option name="compatibility:module-arg" value="HealthFitnessIntegrationTests:enable:true" />
+ <option name="compatibility:module-arg" value="CtsHealthFitnessDeviceTestCasesRateLimiter:enable:true" />
+ <option name="compatibility:module-arg" value="CtsHealthFitnessShowMigrationInfoIntentAbsentTests:enable:true" />
+ <option name="compatibility:module-arg" value="HealthFitnessIntegrationBackupRestoreTests:enable:true" />
+
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-healthfitness-no-unittests.xml b/tools/mts-tradefed/res/config/mts-healthfitness-no-unittests.xml
new file mode 100644
index 0000000..a2b3e66
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-healthfitness-no-unittests.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 The Android Open Source Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<configuration description="Runs MTS-healthfitness from a pre-existing MTS installation excluding unit tests">
+ <include name="mts" />
+
+ <include name="mts-healthfitness-no-unittests-tests-list" />
+
+ <option name="plan" value="mts-healthfitness-no-unittests" />
+</configuration>
+
diff --git a/tools/mts-tradefed/res/config/mts-healthfitness-tests-list.xml b/tools/mts-tradefed/res/config/mts-healthfitness-tests-list.xml
index 7ac75ed..d67cc8c 100644
--- a/tools/mts-tradefed/res/config/mts-healthfitness-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-healthfitness-tests-list.xml
@@ -19,6 +19,9 @@
<option name="compatibility:include-filter" value="CtsHealthConnectControllerTestCases" />
<option name="compatibility:include-filter" value="HealthFitnessIntegrationTests" />
<option name="compatibility:include-filter" value="HealthConnectBackupRestoreUnitTests" />
+ <option name="compatibility:include-filter" value="CtsHealthFitnessDeviceTestCasesRateLimiter"/>
+ <option name="compatibility:include-filter" value="CtsHealthFitnessShowMigrationInfoIntentAbsentTests"/>
+ <option name="compatibility:include-filter" value="HealthFitnessIntegrationBackupRestoreTests"/>
<option name="compatibility:module-arg" value="CtsHealthFitnessDeviceTestCases:enable:true" />
<option name="compatibility:module-arg" value="CtsHealthFitnessDeviceTestCasesNoPermission:enable:true" />
@@ -27,5 +30,8 @@
<option name="compatibility:module-arg" value="CtsHealthConnectControllerTestCases:enable:true" />
<option name="compatibility:module-arg" value="HealthFitnessIntegrationTests:enable:true" />
<option name="compatibility:module-arg" value="HealthConnectBackupRestoreUnitTests:enable:true" />
+ <option name="compatibility:module-arg" value="CtsHealthFitnessDeviceTestCasesRateLimiter:enable:true" />
+ <option name="compatibility:module-arg" value="CtsHealthFitnessShowMigrationInfoIntentAbsentTests:enable:true" />
+ <option name="compatibility:module-arg" value="HealthFitnessIntegrationBackupRestoreTests:enable:true" />
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-mediaprovider-tests-list-user.xml b/tools/mts-tradefed/res/config/mts-mediaprovider-tests-list-user.xml
index 3cc0cb1..a04413c 100644
--- a/tools/mts-tradefed/res/config/mts-mediaprovider-tests-list-user.xml
+++ b/tools/mts-tradefed/res/config/mts-mediaprovider-tests-list-user.xml
@@ -18,6 +18,7 @@
<option name="compatibility:include-filter" value="CtsProviderTestCases android.provider.cts.media." />
<option name="compatibility:include-filter" value="CtsScopedStorageCoreHostTest" />
<option name="compatibility:include-filter" value="CtsScopedStorageHostTest" />
+ <option name="compatibility:include-filter" value="CtsScopedStorageDeviceOnlyTest" />
<option name="compatibility:include-filter" value="CtsScopedStorageGeneralTest" />
<option name="compatibility:include-filter" value="CtsScopedStorageBypassDatabaseOperationsTest" />
<option name="compatibility:include-filter" value="CtsScopedStorageRedactUriTest" />
@@ -34,6 +35,9 @@
<option name="compatibility:module-arg" value="CtsScopedStorageCoreHostTest:enable:true" />
<option name="compatibility:module-arg" value="CtsScopedStorageHostTest:enable:true" />
<option name="compatibility:module-arg" value="CtsScopedStorageDeviceOnlyTest:enable:true" />
+ <option name="compatibility:module-arg" value="CtsScopedStorageGeneralTest:enable:true" />
+ <option name="compatibility:module-arg" value="CtsScopedStorageBypassDatabaseOperationsTest:enable:true" />
+ <option name="compatibility:module-arg" value="CtsScopedStorageRedactUriTest:enable:true" />
<!-- <option name="compatibility:module-arg" value="CtsScopedStoragePublicVolumeHostTest:enable:true" /> -->
<option name="compatibility:module-arg" value="CtsAppCloningHostTest:enable:true" />
<option name="compatibility:module-arg" value="MediaProviderTests:enable:true" />
diff --git a/tools/mts-tradefed/res/config/mts-tests-list-eng-only.xml b/tools/mts-tradefed/res/config/mts-tests-list-eng-only.xml
index a8dcc66..3e0628d 100644
--- a/tools/mts-tradefed/res/config/mts-tests-list-eng-only.xml
+++ b/tools/mts-tradefed/res/config/mts-tests-list-eng-only.xml
@@ -27,4 +27,5 @@
<include name="mts-statsd-tests-list-eng-only" />
<include name="mts-tethering-tests-list-eng-only" />
<include name="mts-uwb-tests-list-eng-only" />
+ <include name="mts-extservices-tests-list-eng-only" />
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-tests-list-user.xml b/tools/mts-tradefed/res/config/mts-tests-list-user.xml
index 89f0ee5..7df7f4f 100644
--- a/tools/mts-tradefed/res/config/mts-tests-list-user.xml
+++ b/tools/mts-tradefed/res/config/mts-tests-list-user.xml
@@ -24,7 +24,7 @@
<include name="mts-dnsresolver-tests-list-user" />
<include name="mts-documentsUI-oem-tests-list" />
<include name="mts-documentsUI-usedapi-tests-list" />
- <include name="mts-extservices-tests-list" />
+ <include name="mts-extservices-tests-list-user" />
<include name="mts-healthfitness-tests-list" />
<include name="mts-linkerconfig-tests-list" />
<include name="mts-ipsec-tests-list" />
