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

Commit 9635e931 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Enable throw-if-cmd-fail on device setup 

For some reason the default behavior of the infra is to suppress exceptions during the device setup (target preparer), which means that if something does wrong we get random test failures, instead of clean setup failures

Fixes: 425227120
Flag: EXEMPT Test only
Test: atest WMShellFlickerTests
Change-Id: If42257e514252c2676f03707e3c45b1a6c3edb0c
parent 4ed75139

libs/WindowManager/Shell/tests/e2e/bubbles/flicker-explicit/AndroidTestTemplate.xml

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
    </target_preparer>

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

        <option name="test-user-token" value="%TEST_USER%"/>

        <option name="throw-if-cmd-fail" value="true" />

        <option name="run-command" value="rm -rf /data/user/%TEST_USER%/files/*"/>

        <!-- Disable AOD -->

        <option name="run-command" value="settings put secure doze_always_on 0"/>

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/AndroidTestTemplate.xml

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
    </target_preparer>

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

        <option name="test-user-token" value="%TEST_USER%"/>

        <option name="throw-if-cmd-fail" value="true" />

        <option name="run-command" value="rm -rf /data/user/%TEST_USER%/files/*"/>

        <option name="run-command" value="settings put secure show_ime_with_hard_keyboard 1"/>

        <option name="run-command" value="settings put system show_touches 1"/>

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/AndroidTestTemplate.xml

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
    </target_preparer>

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

        <option name="test-user-token" value="%TEST_USER%"/>

        <option name="throw-if-cmd-fail" value="true" />

        <option name="run-command" value="rm -rf /data/user/%TEST_USER%/files/*"/>

        <option name="run-command" value="settings put secure show_ime_with_hard_keyboard 1"/>

        <option name="run-command" value="settings put system show_touches 1"/>

libs/WindowManager/Shell/tests/e2e/desktopmode/smoke/AndroidTestTemplate.xml

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
    </target_preparer>

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

        <option name="test-user-token" value="%TEST_USER%"/>

        <option name="throw-if-cmd-fail" value="true" />

        <option name="run-command" value="rm -rf /data/user/%TEST_USER%/files/*"/>

        <option name="run-command" value="settings put secure show_ime_with_hard_keyboard 1"/>

        <option name="run-command" value="settings put system show_touches 1"/>

libs/WindowManager/Shell/tests/e2e/pip2/flicker-service/AndroidTestTemplate.xml

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
    </target_preparer>

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

        <option name="test-user-token" value="%TEST_USER%"/>

        <option name="throw-if-cmd-fail" value="true" />

        <option name="run-command" value="rm -rf /data/user/%TEST_USER%/files/*"/>

        <option name="run-command" value="settings put secure show_ime_with_hard_keyboard 1"/>

        <option name="run-command" value="settings put system show_touches 1"/>