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

Commit de8d74fb authored by Ryan Mitchell's avatar Ryan Mitchell
Browse files

Fix OverlayDeviceTests for un-rooted devices 

The AndroidText.xml needs the root preparer to run on non-rooted
devices.

Bug: 177115481
Bug: 180623619
Test: adb unroot && atest OverlayDeviceTests
Change-Id: I4377207428182fbb76c09abef248b69eeae6acf5
Merged-In: I4377207428182fbb76c09abef248b69eeae6acf5
parent d7d4b0ca

core/tests/overlaytests/device/AndroidTest.xml

+2 −6
Original line number Original line Diff line number Diff line
@@ -19,17 +19,13 @@ 
    <option name="test-suite-tag" value="apct" />

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

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

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





    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />

    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

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

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

        <option name="remount-system" value="true" />

        <option name="remount-system" value="true" />

        <option name="push" value="OverlayDeviceTests.apk->/system/app/OverlayDeviceTests.apk" />

        <option name="push" value="OverlayDeviceTests.apk->/system/app/OverlayDeviceTests.apk" />

    </target_preparer>

    </target_preparer>



    <target_preparer class="com.android.tradefed.targetprep.RebootTargetPreparer" />

    <!-- Reboot to have the test APK scanned by PM and reboot after to remove the test APK. -->

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

      <option name="pre-reboot" value="true" />

      <option name="post-reboot" value="true" />

    </target_preparer>





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

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

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

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