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

Commit 3ff83743 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Remove flaky from default excluded tests 

Atest cannot override include-annotation and exclude-annotation from the Android.xml, only append new ones.

Ideally we should have a single test configuration for all flicker tests (presubmit/postsubmit/flaky) and adjust the arguments according to the type of test we intend to run.

Presubmit:
    atest FlickerTests -- --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Presubmit --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest

Postsubmit:
    atest FlickerTests -- --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Postsubmit --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest

Flaky:
    atest FlickerTests -- --module-arg FlickerTests:include-annotation:androidx.test.filters.FlakyTest

To run WMShellFlickerTests, just replace FlickerTests for WMShellFlickerTests in the commands above.

Bug: 170490377
Test: atest FlickerTests WMShellFlickerTests
Change-Id: Ic252f27065714e9039e3c0f33659b98eb288aa6f
parent 3919f6d2

libs/WindowManager/Shell/tests/flicker/AndroidTest.xml

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
    </target_preparer>

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

        <option name="package" value="com.android.wm.shell.flicker"/>

        <option name="include-annotation" value="androidx.test.filters.RequiresDevice" />

        <option name="exclude-annotation" value="androidx.test.filters.FlakyTest" />

        <option name="shell-timeout" value="6600s" />

        <option name="test-timeout" value="6000s" />

        <option name="hidden-api-checks" value="false" />

tests/FlickerTests/AndroidTest.xml

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

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

        <option name="package" value="com.android.server.wm.flicker"/>

        <option name="exclude-annotation" value="androidx.test.filters.FlakyTest" />

        <option name="shell-timeout" value="6600s" />

        <option name="test-timeout" value="6600s" />

        <option name="hidden-api-checks" value="false" />