From 6e2960cba6fda030c0577c5884932de1074df0e7 Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Tue, 19 Apr 2022 16:13:39 +0000 Subject: [PATCH] Disable flaky app launch flicker tests Bug: 229735718 Bug: 229738092 Test: atest FlickerTests Change-Id: I50eaeedf2bac0d824595fcea744c4f7ea7fedfab --- .../launch/OpenAppFromLockNotificationCold.kt | 7 ++++++ .../launch/OpenAppFromLockNotificationWarm.kt | 6 +++++ ...pFromLockNotificationWithLockOverlayApp.kt | 8 ++++++- .../flicker/launch/OpenAppFromOverviewTest.kt | 22 +++++++++++++++++++ .../wm/flicker/launch/OpenAppWarmTest.kt | 4 ++++ 5 files changed, 46 insertions(+), 1 deletion(-) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt index 8daf4ca696bf3..ed2ef95241f26 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt @@ -18,12 +18,14 @@ package com.android.server.wm.flicker.launch import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.RequiresDevice +import androidx.test.filters.FlakyTest import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter import com.android.server.wm.flicker.FlickerTestParameterFactory import com.android.server.wm.flicker.annotation.Group1 import com.android.server.wm.flicker.dsl.FlickerBuilder import org.junit.FixMethodOrder +import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters import org.junit.runners.Parameterized @@ -65,6 +67,11 @@ open class OpenAppFromLockNotificationCold(testSpec: FlickerTestParameter) } } + /** {@inheritDoc} */ + @FlakyTest(bugId = 229735718) + @Test + override fun entireScreenCovered() = super.entireScreenCovered() + companion object { /** * Creates the test configurations. diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt index 8eb182a9fa319..a9bb099089ac9 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt @@ -18,6 +18,7 @@ package com.android.server.wm.flicker.launch import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.RequiresDevice +import androidx.test.filters.FlakyTest import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter import com.android.server.wm.flicker.FlickerTestParameterFactory @@ -97,6 +98,11 @@ open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter) } } + /** {@inheritDoc} */ + @FlakyTest(bugId = 229735718) + @Test + override fun entireScreenCovered() = super.entireScreenCovered() + companion object { /** * Creates the test configurations. diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWithLockOverlayApp.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWithLockOverlayApp.kt index 28a914b96449d..bc637f8f9a639 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWithLockOverlayApp.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWithLockOverlayApp.kt @@ -18,6 +18,7 @@ package com.android.server.wm.flicker.launch import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.RequiresDevice +import androidx.test.filters.FlakyTest import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter import com.android.server.wm.flicker.FlickerTestParameterFactory @@ -103,6 +104,11 @@ class OpenAppFromLockNotificationWithLockOverlayApp(testSpec: FlickerTestParamet } } + /** {@inheritDoc} */ + @FlakyTest(bugId = 229735718) + @Test + override fun entireScreenCovered() = super.entireScreenCovered() + companion object { /** * Creates the test configurations. @@ -113,7 +119,7 @@ class OpenAppFromLockNotificationWithLockOverlayApp(testSpec: FlickerTestParamet @Parameterized.Parameters(name = "{0}") @JvmStatic fun getParams(): Collection { - return com.android.server.wm.flicker.FlickerTestParameterFactory.getInstance() + return FlickerTestParameterFactory.getInstance() .getConfigNonRotationTests(repetitions = 3) } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt index 6e33f66d111d1..18f077f241de6 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt @@ -26,9 +26,11 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory import com.android.server.wm.flicker.LAUNCHER_COMPONENT import com.android.server.wm.flicker.annotation.Group1 import com.android.server.wm.flicker.dsl.FlickerBuilder +import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled import com.android.server.wm.flicker.helpers.reopenAppFromOverview import com.android.server.wm.flicker.helpers.setRotation import com.android.server.wm.traces.common.WindowManagerConditionsFactory +import org.junit.Assume import org.junit.FixMethodOrder import org.junit.Test import org.junit.runner.RunWith @@ -132,6 +134,26 @@ open class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) @Test override fun appWindowBecomesVisible() = super.appWindowBecomesVisible_warmStart() + /** {@inheritDoc} */ + @FlakyTest(bugId = 229735718) + @Test + override fun entireScreenCovered() = super.entireScreenCovered() + + /** {@inheritDoc} */ + @Presubmit + @Test + override fun appWindowReplacesLauncherAsTopWindow() { + Assume.assumeFalse(isShellTransitionsEnabled) + super.appWindowReplacesLauncherAsTopWindow() + } + + @FlakyTest(bugId = 229738092) + @Test + fun appWindowReplacesLauncherAsTopWindow_ShellTransit() { + Assume.assumeTrue(isShellTransitionsEnabled) + super.appWindowReplacesLauncherAsTopWindow() + } + companion object { /** * Creates the test configurations. diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt index 48f6aeb4d8244..97528c0471cce 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt @@ -130,6 +130,10 @@ open class OpenAppWarmTest(testSpec: FlickerTestParameter) @Test override fun appWindowBecomesVisible() = super.appWindowBecomesVisible_warmStart() + @FlakyTest(bugId = 229735718) + @Test + override fun entireScreenCovered() = super.entireScreenCovered() + companion object { /** * Creates the test configurations.