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

Commit cfce53fc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 098c3d74 3ff83743

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