3b81323e4a
Add missing @ConnectivityModuleTest annotations to tests that cover functionalities that were introduced in a newer connectivity module update. Also add CtsNetTestCasesLatestSdk to postsubmit with only APK modules installed, and with only the connectivity/tethering module installed. This can then be moved to presubmit to catch such issues before they are merged. While doing this cleanup the TEST_MAPPING file in tests/ and merge its contents into the root TEST_MAPPING file. This does not change anything for "postsubmit" tests as they are run independently of changes. It only causes FrameworksNetIntegrationTests to run in presubmit on any change in modules/Connectivity/ instead of only on modules/Connectivity/tests/ changes, which is how it should be. Bug: 218611855 Test: TH needs to test TEST_MAPPING Change-Id: I26629a35d8c2df3db33180ecc22d49d538ad3b8b
40 lines
2.2 KiB
XML
40 lines
2.2 KiB
XML
<!-- Copyright (C) 2015 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="Test config for {MODULE}">
|
|
<option name="test-suite-tag" value="cts" />
|
|
<option name="config-descriptor:metadata" key="component" value="networking" />
|
|
<option name="config-descriptor:metadata" key="token" value="SIM_CARD" />
|
|
<option name="config-descriptor:metadata" key="parameter" value="instant_app" />
|
|
<option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
|
|
<option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
|
|
|
|
<option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />
|
|
<option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk" />
|
|
<option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.tethering.apex" />
|
|
<option name="not-shardable" value="true" />
|
|
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
|
|
<option name="cleanup-apks" value="true" />
|
|
<option name="test-file-name" value="{MODULE}.apk" />
|
|
</target_preparer>
|
|
<target_preparer class="com.android.testutils.ConnectivityCheckTargetPreparer">
|
|
</target_preparer>
|
|
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
|
|
<option name="package" value="android.net.cts" />
|
|
<option name="runtime-hint" value="9m4s" />
|
|
<option name="hidden-api-checks" value="false" />
|
|
<option name="isolated-storage" value="false" />
|
|
</test>
|
|
</configuration>
|