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

Commit 5d46768a authored by Bernie Innocenti's avatar Bernie Innocenti
Browse files

Remove resolv/AndroidTest.xml 

The presence of this file confuses atest into running
netd_integration_test instead of resolv_unit_test.

This file was added in aosp/720345 to increase the per-test timeout to
120 seconds for resolv_integration_test due to the following tests being
slower in CI than in local runs:

 - ResolverTest#GetAddrInfoStressTest_Binder_100
 - ResolverTest#GetAddrInfoStressTest_Binder_100000

But this might no longer be necessary, it seems that tests execute in a
few seconds in current TreeHugger runs.

Test: run treehugger
Change-Id: Iffd2e6fa0d7ae7af0dc1707ded6b24970eb18ee2
parent 48e6fcc7

AndroidTest.xml

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2017 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.

-->

<!-- This test config file is auto-generated. -->

<configuration description="Config for resolv_integration_test.">

    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct-native" />

    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

        <option name="cleanup" value="true" />

        <option name="push" value="resolv_integration_test->/data/local/tmp/resolv_integration_test" />

    </target_preparer>



    <test class="com.android.tradefed.testtype.GTest" >

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="module-name" value="resolv_integration_test" />

        <!--

            On 2018-12-12, GetAddrInfoStressTest_Binder_100 suddenly jumped

            from ~1xs to ~70s runtime in APCT continuous integration, causing

            resolv_integration_test to flake with the default 60s timeout.

            We're not sure what caused the regression, but it's not due to a change

            in the Android image and unlikely to affect users.

            Just bump the timeout to 120s for now.

        -->

        <option name="native-test-timeout" value="120000" />

    </test>

</configuration>