Merge "Remove flaky from default excluded tests" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
cfce53fc55
@@ -25,8 +25,6 @@
|
|||||||
</target_preparer>
|
</target_preparer>
|
||||||
<test class="com.android.tradefed.testtype.AndroidJUnitTest">
|
<test class="com.android.tradefed.testtype.AndroidJUnitTest">
|
||||||
<option name="package" value="com.android.wm.shell.flicker"/>
|
<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="shell-timeout" value="6600s" />
|
||||||
<option name="test-timeout" value="6000s" />
|
<option name="test-timeout" value="6000s" />
|
||||||
<option name="hidden-api-checks" value="false" />
|
<option name="hidden-api-checks" value="false" />
|
||||||
|
|||||||
@@ -25,7 +25,6 @@
|
|||||||
</target_preparer>
|
</target_preparer>
|
||||||
<test class="com.android.tradefed.testtype.AndroidJUnitTest">
|
<test class="com.android.tradefed.testtype.AndroidJUnitTest">
|
||||||
<option name="package" value="com.android.server.wm.flicker"/>
|
<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="shell-timeout" value="6600s" />
|
||||||
<option name="test-timeout" value="6600s" />
|
<option name="test-timeout" value="6600s" />
|
||||||
<option name="hidden-api-checks" value="false" />
|
<option name="hidden-api-checks" value="false" />
|
||||||
|
|||||||
Reference in New Issue
Block a user