From 9e9c069e2d7700fa627ba199beaeb1fdab2fa345 Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Wed, 16 Feb 2022 12:48:05 +0100 Subject: Demote flaky transitions Test: NA Change-Id: Ibae3c102a953aeb4bbf69b76cf83b540457fb3e9 --- .../android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest.kt | 5 +++++ .../flicker/pip/MovePipDownShelfHeightChangeTest_ShellTransit.kt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'libs/WindowManager/Shell') diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest.kt index 4830b291ffe6..87e927fd50ea 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest.kt @@ -61,6 +61,11 @@ import org.junit.runners.Parameterized open class MovePipDownShelfHeightChangeTest( testSpec: FlickerTestParameter ) : MovePipShelfHeightTransition(testSpec) { + @Before + open fun before() { + Assume.assumeFalse(isShellTransitionsEnabled) + } + /** * Defines the transition used to run the test */ diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest_ShellTransit.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest_ShellTransit.kt index f0646a3f1e11..0ff260b94dc8 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest_ShellTransit.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest_ShellTransit.kt @@ -58,7 +58,7 @@ class MovePipDownShelfHeightChangeTest_ShellTransit( testSpec: FlickerTestParameter ) : MovePipDownShelfHeightChangeTest(testSpec) { @Before - fun before() { + override fun before() { Assume.assumeTrue(isShellTransitionsEnabled) } } -- cgit v1.2.3-59-g8ed1b