summaryrefslogtreecommitdiff
path: root/libs/WindowManager/Shell
diff options
context:
space:
mode:
author Pablo Gamito <pablogamito@google.com> 2022-02-16 12:48:05 +0100
committer Pablo Gamito <pablogamito@google.com> 2022-02-16 17:19:07 +0100
commit9e9c069e2d7700fa627ba199beaeb1fdab2fa345 (patch)
tree0c798598638d053e897e722f81f6dee38576dfd9 /libs/WindowManager/Shell
parent904c875e23590449cbc37b9dbc85ee2c144e6335 (diff)
Demote flaky transitions
Test: NA Change-Id: Ibae3c102a953aeb4bbf69b76cf83b540457fb3e9
Diffstat (limited to 'libs/WindowManager/Shell')
-rw-r--r--libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest.kt5
-rw-r--r--libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest_ShellTransit.kt2
2 files changed, 6 insertions, 1 deletions
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)
}
}