From ddc3e915e7eb8a33258edb3f6a11170567fff1c6 Mon Sep 17 00:00:00 2001
From: Pablo Gamito <pablogamito@google.com>
Date: Tue, 25 Jul 2023 17:21:28 +0000
Subject: [PATCH] Mark flaky tests in HorizontalSplitChangeRatioTest as flaky

Bug: 293075402

Test: atest com.android.server.wm.flicker.activityembedding.HorizontalSplitChangeRatioTest
Change-Id: I0fadc91830529ad177f44baff5676cc0332c8425
---
 .../activityembedding/ActivityEmbeddingTestBase.kt        | 2 +-
 .../layoutchange/HorizontalSplitChangeRatioTest.kt        | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/ActivityEmbeddingTestBase.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/ActivityEmbeddingTestBase.kt
index 45176448a9f47..e1af6e93de2cf 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/ActivityEmbeddingTestBase.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/ActivityEmbeddingTestBase.kt
@@ -36,7 +36,7 @@ abstract class ActivityEmbeddingTestBase(flicker: LegacyFlickerTest) : BaseTest(
     /** Asserts the background animation layer is never visible during bounds change transition. */
     @Presubmit
     @Test
-    fun backgroundLayerNeverVisible() {
+    open fun backgroundLayerNeverVisible() {
         val backgroundColorLayer = ComponentNameMatcher("", "Animation Background")
         flicker.assertLayers {
             isInvisible(backgroundColorLayer)
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/layoutchange/HorizontalSplitChangeRatioTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/layoutchange/HorizontalSplitChangeRatioTest.kt
index badd876ae321f..7457e80496635 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/layoutchange/HorizontalSplitChangeRatioTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/layoutchange/HorizontalSplitChangeRatioTest.kt
@@ -16,6 +16,7 @@
 
 package com.android.server.wm.flicker.activityembedding
 
+import android.platform.test.annotations.FlakyTest
 import android.platform.test.annotations.Presubmit
 import android.tools.common.datatypes.Rect
 import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
@@ -65,6 +66,13 @@ class HorizontalSplitChangeRatioTest(flicker: LegacyFlickerTest) :
         }
     }
 
+    @FlakyTest(bugId = 293075402)
+    override fun backgroundLayerNeverVisible() = super.backgroundLayerNeverVisible()
+
+    @FlakyTest(bugId = 293075402)
+    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =
+        super.visibleLayersShownMoreThanOneConsecutiveEntry()
+
     /** Assert the Main activity window is always visible. */
     @Presubmit
     @Test