From 3ff83743e2ad99818c778f2b63ae778962ee6dc1 Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Thu, 4 Feb 2021 17:59:55 +0100 Subject: 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 --- libs/WindowManager/Shell/tests/flicker/AndroidTest.xml | 2 -- tests/FlickerTests/AndroidTest.xml | 1 - 2 files changed, 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 @@