From 1eb098cec161b56515a4925b9c7c227a547c8aef Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Wed, 5 Oct 2022 19:19:25 +0000 Subject: [PATCH] Demote flaky tests Test: N/A Change-Id: Ie31207cbb06cbbe993786134a4407c13779cc832 --- .../bubble/LaunchBubbleFromLockScreen.kt | 6 ++ .../flicker/pip/AutoEnterPipOnGoToHomeTest.kt | 2 +- .../pip/EnterPipToOtherOrientationTest.kt | 6 ++ .../pip/ExitPipViaExpandButtonClickTest.kt | 3 +- .../wm/flicker/ime/ReOpenImeWindowTest.kt | 72 ++++++++++++++++--- .../launch/OpenAppNonResizeableTest.kt | 6 ++ 6 files changed, 85 insertions(+), 10 deletions(-) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleFromLockScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleFromLockScreen.kt index 275f6c8022935..47167b8b469ed 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleFromLockScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleFromLockScreen.kt @@ -143,4 +143,10 @@ class LaunchBubbleFromLockScreen(testSpec: FlickerTestParameter) : BaseBubbleScr @Test override fun visibleWindowsShownMoreThanOneConsecutiveEntry() = super.visibleWindowsShownMoreThanOneConsecutiveEntry() + + @FlakyTest(bugId = 251217773) + @Test + override fun entireScreenCovered() { + super.entireScreenCovered() + } } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/AutoEnterPipOnGoToHomeTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/AutoEnterPipOnGoToHomeTest.kt index 1fc0375e9febe..7d498dcb35f7b 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/AutoEnterPipOnGoToHomeTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/AutoEnterPipOnGoToHomeTest.kt @@ -92,7 +92,7 @@ class AutoEnterPipOnGoToHomeTest(testSpec: FlickerTestParameter) : EnterPipTest( } /** Checks that [pipApp] window is animated towards default position in right bottom corner */ - @Presubmit + @FlakyTest(bugId = 251135384) @Test fun pipLayerMovesTowardsRightBottomCorner() { // in gestural nav the swipe makes PiP first go upwards diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt index 104b409731dd9..b4594dee2c731 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt @@ -141,6 +141,12 @@ class EnterPipToOtherOrientationTest( @Test fun entireScreenCoveredAtStartAndEnd() = testSpec.entireScreenCovered(allStates = false) + @FlakyTest(bugId = 251219769) + @Test + override fun entireScreenCovered() { + super.entireScreenCovered() + } + /** * Checks [pipApp] window remains visible and on top throughout the transition */ diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt index 5e3194ca4ee27..6bf7e8c847eee 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt @@ -16,6 +16,7 @@ package com.android.wm.shell.flicker.pip +import android.platform.test.annotations.FlakyTest import android.platform.test.annotations.Presubmit import android.view.Surface import androidx.test.filters.RequiresDevice @@ -81,7 +82,7 @@ class ExitPipViaExpandButtonClickTest( override fun entireScreenCovered() = super.entireScreenCovered() /** {@inheritDoc} */ - @Presubmit + @FlakyTest(bugId = 197726610) @Test override fun pipLayerExpands() = super.pipLayerExpands() diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt index 4c476848ecd1e..a27b2da1a19ec 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt @@ -16,7 +16,7 @@ package com.android.server.wm.flicker.ime -import android.platform.test.annotations.Presubmit +import android.platform.test.annotations.FlakyTest import android.view.Surface import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.BaseTest @@ -61,7 +61,7 @@ open class ReOpenImeWindowTest(testSpec: FlickerTestParameter) : BaseTest(testSp } /** {@inheritDoc} */ - @Presubmit + @FlakyTest(bugId = 251214932) @Test override fun visibleLayersShownMoreThanOneConsecutiveEntry() { // depends on how much of the animation transactions are sent to SF at once @@ -79,7 +79,7 @@ open class ReOpenImeWindowTest(testSpec: FlickerTestParameter) : BaseTest(testSp } /** {@inheritDoc} */ - @Presubmit + @FlakyTest(bugId = 251214932) @Test override fun visibleWindowsShownMoreThanOneConsecutiveEntry() { val component = ComponentNameMatcher("", "RecentTaskScreenshotSurface") @@ -95,7 +95,7 @@ open class ReOpenImeWindowTest(testSpec: FlickerTestParameter) : BaseTest(testSp } } - @Presubmit + @FlakyTest(bugId = 251214932) @Test fun launcherWindowBecomesInvisible() { testSpec.assertWm { @@ -105,9 +105,11 @@ open class ReOpenImeWindowTest(testSpec: FlickerTestParameter) : BaseTest(testSp } } - @Presubmit @Test fun imeWindowIsAlwaysVisible() = testSpec.imeWindowIsAlwaysVisible() + @FlakyTest(bugId = 251214932) + @Test + fun imeWindowIsAlwaysVisible() = testSpec.imeWindowIsAlwaysVisible() - @Presubmit + @FlakyTest(bugId = 251214932) @Test fun imeAppWindowIsAlwaysVisible() { // the app starts visible in live tile, and stays visible for the duration of entering @@ -117,13 +119,13 @@ open class ReOpenImeWindowTest(testSpec: FlickerTestParameter) : BaseTest(testSp testSpec.assertWm { this.isAppWindowVisible(testApp) } } - @Presubmit + @FlakyTest(bugId = 251214932) @Test fun imeLayerBecomesVisible() { testSpec.assertLayers { this.isVisible(ComponentNameMatcher.IME) } } - @Presubmit + @FlakyTest(bugId = 251214932) @Test fun appLayerReplacesLauncher() { testSpec.assertLayers { @@ -135,6 +137,60 @@ open class ReOpenImeWindowTest(testSpec: FlickerTestParameter) : BaseTest(testSp } } + @FlakyTest(bugId = 251214932) + @Test + override fun navBarLayerPositionAtStartAndEnd() { + super.navBarLayerPositionAtStartAndEnd() + } + + @FlakyTest(bugId = 251214932) + @Test + override fun navBarWindowIsAlwaysVisible() { + super.navBarWindowIsAlwaysVisible() + } + + @FlakyTest(bugId = 251214932) + @Test + override fun statusBarLayerIsVisibleAtStartAndEnd() { + super.statusBarLayerIsVisibleAtStartAndEnd() + } + + @FlakyTest(bugId = 251214932) + @Test + override fun entireScreenCovered() { + super.entireScreenCovered() + } + + @FlakyTest(bugId = 251214932) + @Test + override fun navBarLayerIsVisibleAtStartAndEnd() { + super.navBarLayerIsVisibleAtStartAndEnd() + } + + @FlakyTest(bugId = 251214932) + @Test + override fun statusBarLayerPositionAtStartAndEnd() { + super.statusBarLayerPositionAtStartAndEnd() + } + + @FlakyTest(bugId = 251214932) + @Test + override fun statusBarWindowIsAlwaysVisible() { + super.statusBarWindowIsAlwaysVisible() + } + + @FlakyTest(bugId = 251214932) + @Test + override fun taskBarLayerIsVisibleAtStartAndEnd() { + super.taskBarLayerIsVisibleAtStartAndEnd() + } + + @FlakyTest(bugId = 251214932) + @Test + override fun taskBarWindowIsAlwaysVisible() { + super.taskBarWindowIsAlwaysVisible() + } + companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt index 559728739111f..89e3b5fefcf74 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt @@ -197,6 +197,12 @@ open class OpenAppNonResizeableTest(testSpec: FlickerTestParameter) : @Test override fun appWindowBecomesTopWindow() = super.appWindowBecomesTopWindow() + @FlakyTest(bugId = 251217585) + @Test + override fun focusChanges() { + super.focusChanges() + } + companion object { /** * Creates the test configurations.