diff options
| author | 2021-02-08 22:33:02 +0000 | |
|---|---|---|
| committer | 2021-02-08 22:33:02 +0000 | |
| commit | cfce53fc5525365a8dd4d289035c4319ab258c2d (patch) | |
| tree | d3cc8d8fcc7980c8b4bb50356527bc1526f54d13 | |
| parent | 098c3d746cf7b9f55d4a0f248b2d810580acdeac (diff) | |
| parent | 3ff83743e2ad99818c778f2b63ae778962ee6dc1 (diff) | |
Merge "Remove flaky from default excluded tests" into sc-dev
| -rw-r--r-- | libs/WindowManager/Shell/tests/flicker/AndroidTest.xml | 2 | ||||
| -rw-r--r-- | tests/FlickerTests/AndroidTest.xml | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/libs/WindowManager/Shell/tests/flicker/AndroidTest.xml b/libs/WindowManager/Shell/tests/flicker/AndroidTest.xml index 8258630a9502..f06d57c6c789 100644 --- a/libs/WindowManager/Shell/tests/flicker/AndroidTest.xml +++ b/libs/WindowManager/Shell/tests/flicker/AndroidTest.xml @@ -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" /> diff --git a/tests/FlickerTests/AndroidTest.xml b/tests/FlickerTests/AndroidTest.xml index e68fbd8724de..b2719fbcac82 100644 --- a/tests/FlickerTests/AndroidTest.xml +++ b/tests/FlickerTests/AndroidTest.xml @@ -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" /> |