Merge "Disable flaky test" into main

2023-07-27 06:56:00 +00:00
parent bcfe98be95 cec95f9d26
commit b4e3962422
1 changed files with 6 additions and 1 deletions
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/open/OpenTrampolineActivityTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/open/OpenTrampolineActivityTest.kt
@@ -165,7 +165,6 @@ class OpenTrampolineActivityTest(flicker: LegacyFlickerTest) : ActivityEmbedding

    @FlakyTest(bugId = 290736037)
    /** Main activity should go from fullscreen to being a split with secondary activity. */
-    @Presubmit
    @Test
    fun mainActivityLayerGoesFromFullscreenToSplit() {
        flicker.assertLayers {
@@ -197,6 +196,12 @@ class OpenTrampolineActivityTest(flicker: LegacyFlickerTest) : ActivityEmbedding
        }
    }

+    @FlakyTest(bugId = 288591571)
+    @Test
+    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {
+        super.visibleLayersShownMoreThanOneConsecutiveEntry()
+    }
+
    companion object {
        /** {@inheritDoc} */
        private var startDisplayBounds = Rect.EMPTY