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

Commit 820faa7a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove flaky from default excluded tests" into sc-dev am: cfce53fc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13494165

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id10e5e0f3e79118d3d63ab546dd1e40c38d93c83
parents 7cba1ea4 cfce53fc

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" />