From d42926bdb083ffee1bff0ac679a9a691c0ffe654 Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Wed, 26 Jan 2022 13:01:35 +0100 Subject: [PATCH] Demote OpenAppFromOverviewTest#appWindowReplacesLauncherAsTopWindow to flaky test Change-Id: I9763e14f9236d71112e8f2e280d2be1a7a36a573 --- .../flicker/launch/OpenAppFromOverviewTest.kt | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) 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 7443f0bc881c3..61df403dd9ba7 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 @@ -28,7 +28,10 @@ import com.android.server.wm.flicker.annotation.Group1 import com.android.server.wm.flicker.helpers.reopenAppFromOverview import com.android.server.wm.flicker.helpers.setRotation import com.android.server.wm.flicker.dsl.FlickerBuilder +import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled import com.android.server.wm.traces.common.WindowManagerConditionsFactory +import org.junit.Assume.assumeFalse +import org.junit.Assume.assumeTrue import org.junit.FixMethodOrder import org.junit.Test import org.junit.runner.RunWith @@ -125,6 +128,21 @@ class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) : OpenAppTransitio @Test override fun navBarWindowIsVisible() = super.navBarWindowIsVisible() + /** {@inheritDoc} */ + @Presubmit + @Test + override fun appWindowReplacesLauncherAsTopWindow() { + assumeFalse(isShellTransitionsEnabled) + super.appWindowReplacesLauncherAsTopWindow() + } + + @FlakyTest(bugId = 216266712) + @Test + fun appWindowReplacesLauncherAsTopWindow_shellTransit() { + assumeTrue(isShellTransitionsEnabled) + super.appWindowReplacesLauncherAsTopWindow() + } + companion object { /** * Creates the test configurations. @@ -139,4 +157,4 @@ class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) : OpenAppTransitio .getConfigNonRotationTests(repetitions = 5) } } -} \ No newline at end of file +}