Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1186f26a authored by Julien Desprez's avatar Julien Desprez Committed by android-build-merger
Browse files

Merge "Add adb_integration_test_device to general-tests" am: 42a2e9eb am: dfd0db42

am: ac372623

Change-Id: I24f3fe6529c672ae33753d9ebaacb54005d77ee0
parents 7ba190c7 ac372623
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ python_test_host {
    },
}

python_binary_host {
python_test_host {
    name: "adb_integration_test_device",
    main: "test_device.py",
    srcs: [
@@ -495,6 +495,8 @@ python_binary_host {
    libs: [
        "adb_py",
    ],
    test_config: "adb_integration_test_device.xml",
    test_suites: ["general-tests"],
    version: {
        py2: {
            enabled: true,
+29 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2018 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="Config to run adb integration tests for device">
    <option name="test-suite-tag" value="adb_tests" />
    <option name="test-suite-tag" value="adb_integration_device" />
    <target_preparer class="com.android.tradefed.targetprep.SemaphoreTokenTargetPreparer">
        <option name="disable" value="false" />
    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.adb.AdbStopServerPreparer" />
    <test class="com.android.tradefed.testtype.python.PythonBinaryHostTest" >
        <option name="par-file-name" value="adb_integration_test_device" />
        <option name="inject-android-serial" value="true" />
        <option name="test-timeout" value="2m" />
    </test>
</configuration>