5714031dcc
This will mark connectivity diagnostics files collected on failure as CONNDIAG type, so they can be easily identified in test results. Having a separate type will also allow automatically filtering them so they can be pulled across test results and flake stats can be aggregated (for example to identify which wifi access points are typically flaky). The CONNDIAG type was added in change ID: Ib56decb7660e9f93844337fa7a5bf9b00610c1c6 See that change for details of the option on FilePullerLogCollector. Test: atest Change-Id: I00fe23acf308723583e8ec82a032b42475a68173
83 lines
5.4 KiB
XML
83 lines
5.4 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.compatibility.common.tradefed.targetprep.DynamicConfigPusher">
|
|
<option name="has-server-side-config" value="false" />
|
|
<option name="target" value="device" />
|
|
<option name="config-filename" value="{MODULE}" />
|
|
<option name="version" value="1.0" />
|
|
</target_preparer>
|
|
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
|
|
<option name="cleanup-apks" value="true" />
|
|
<option name="test-file-name" value="{MODULE}.apk" />
|
|
<option name="test-file-name" value="CtsCarrierServicePackage.apk" />
|
|
</target_preparer>
|
|
<target_preparer class="com.android.testutils.ConnectivityTestTargetPreparer">
|
|
</target_preparer>
|
|
<target_preparer class="com.android.testutils.DisableConfigSyncTargetPreparer">
|
|
</target_preparer>
|
|
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
|
|
<option name="package" value="{PACKAGE}" />
|
|
<option name="runtime-hint" value="9m4s" />
|
|
<option name="hidden-api-checks" value="false" />
|
|
<option name="isolated-storage" value="false" />
|
|
<option name="instrumentation-arg" key="test-module-name" value="{MODULE}" />
|
|
<!-- Test filter that allows test APKs to select which tests they want to run by annotating
|
|
those tests with an annotation matching the name of the APK.
|
|
|
|
This allows us to maintain one AndroidTestTemplate.xml for all CtsNetTestCases*.apk,
|
|
and have CtsNetTestCases run all tests, but have CtsNetTestCasesMaxTargetSdk31 run only
|
|
tests that require target SDK 31.
|
|
|
|
This relies on the fact that if the class specified in include-annotation exists, then
|
|
the runner will only run the tests annotated with that annotation, but if it does not,
|
|
the runner will run all the tests. -->
|
|
<option name="include-annotation" value="com.android.testutils.filters.{MODULE}" />
|
|
<option name="device-listeners" value="com.android.testutils.ConnectivityDiagnosticsCollector" />
|
|
</test>
|
|
<metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">
|
|
<!-- Pattern matching the fileKey used by ConnectivityDiagnosticsCollector when calling addFileMetric -->
|
|
<option name="pull-pattern-keys" value="com.android.testutils.ConnectivityDiagnosticsCollector.*" />
|
|
<option name="log-data-type" value="CONNDIAG" />
|
|
<option name="collect-on-run-ended-only" value="true" />
|
|
</metrics_collector>
|
|
<!-- When this test is run in a Mainline context (e.g. with `mts-tradefed`), only enable it if
|
|
one of the Mainline modules below is present on the device used for testing. -->
|
|
<object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
|
|
<!-- Tethering Module (internal version). -->
|
|
<option name="mainline-module-package-name" value="com.google.android.tethering" />
|
|
<!-- Tethering Module (AOSP version). -->
|
|
<option name="mainline-module-package-name" value="com.android.tethering" />
|
|
<!-- NetworkStack Module (internal version). Should always be installed with CaptivePortalLogin. -->
|
|
<option name="mainline-module-package-name" value="com.google.android.networkstack" />
|
|
<!-- NetworkStack Module (AOSP version). Should always be installed with CaptivePortalLogin. -->
|
|
<option name="mainline-module-package-name" value="com.android.networkstack" />
|
|
<!-- Resolver Module (internal version). -->
|
|
<option name="mainline-module-package-name" value="com.google.android.resolv" />
|
|
<!-- Resolver Module (AOSP version). -->
|
|
<option name="mainline-module-package-name" value="com.android.resolv" />
|
|
</object>
|
|
</configuration>
|