Disable NearbyMultiDevicesTestSuite in CTS.

Test: N/A
Bug: 234673334
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: Ib1260ddd7e91ab6a41e3637a40e316cdf4084f2c
This commit is contained in:
Eric Lin
2022-06-08 17:28:48 +00:00
parent 29bae99600
commit 56b97ffdb0
2 changed files with 15 additions and 5 deletions

View File

@@ -16,16 +16,16 @@ package {
default_applicable_licenses: ["Android-Apache-2.0"], default_applicable_licenses: ["Android-Apache-2.0"],
} }
// Run the tests: atest -v CtsNearbyMultiDevicesTestSuite // Run the tests: atest -v NearbyMultiDevicesTestSuite
// Check go/run-nearby-mainline-e2e for more details. // Check go/run-nearby-mainline-e2e for more details.
python_test_host { python_test_host {
name: "CtsNearbyMultiDevicesTestSuite", name: "NearbyMultiDevicesTestSuite",
main: "suite_main.py", main: "suite_main.py",
srcs: ["*.py"], srcs: ["*.py"],
libs: ["NearbyMultiDevicesHostHelper"], libs: ["NearbyMultiDevicesHostHelper"],
test_suites: [ test_suites: [
"cts",
"general-tests", "general-tests",
"mts-tethering",
], ],
test_options: { test_options: {
unit_test: false, unit_test: false,

View File

@@ -11,7 +11,17 @@
limitations under the License. limitations under the License.
--> -->
<configuration description="Config for CTS Nearby Mainline multi devices end-to-end test suite"> <configuration description="Config for CTS Nearby Mainline multi devices end-to-end test suite">
<option name="test-suite-tag" value="cts" /> <!-- Only run tests if the device under test is SDK version 33 (Android 13) or above. -->
<object type="module_controller"
class="com.android.tradefed.testtype.suite.module.Sdk33ModuleController" />
<!-- Only run NearbyMultiDevicesTestSuite in MTS if the Nearby Mainline module is installed. -->
<object type="module_controller"
class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
<option name="mainline-module-package-name" value="com.google.android.tethering" />
</object>
<option name="test-suite-tag" value="apct" />
<option name="test-tag" value="NearbyMultiDevicesTestSuite" />
<option name="config-descriptor:metadata" key="component" value="wifi" /> <option name="config-descriptor:metadata" key="component" value="wifi" />
<option name="config-descriptor:metadata" key="parameter" value="not_instant_app" /> <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
<option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" /> <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
@@ -124,7 +134,7 @@
<test class="com.android.tradefed.testtype.mobly.MoblyBinaryHostTest"> <test class="com.android.tradefed.testtype.mobly.MoblyBinaryHostTest">
<!-- The mobly-par-file-name should match the module name --> <!-- The mobly-par-file-name should match the module name -->
<option name="mobly-par-file-name" value="CtsNearbyMultiDevicesTestSuite" /> <option name="mobly-par-file-name" value="NearbyMultiDevicesTestSuite" />
<!-- Timeout limit in milliseconds for all test cases of the python binary --> <!-- Timeout limit in milliseconds for all test cases of the python binary -->
<option name="mobly-test-timeout" value="60000" /> <option name="mobly-test-timeout" value="60000" />
</test> </test>