Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f75c9660 authored by wilsonshih's avatar wilsonshih
Browse files

Re-enable several open app flicker tests for shell transition. 

Verified those tests are fixed by b/211844337

Bug: 206094140
Bug: 210968557
Test: atest OpenAppColdTest OpenAppWarmTest
Change-Id: Ied771dcaade99872b24c250568225e950092b076
parent b1c12cbd

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt

+1 −5
Original line number Diff line number Diff line
@@ -99,11 +99,7 @@ class OpenAppColdTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp 
    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun appLayerReplacesLauncher() {

        // This test doesn't work in shell transitions because of b/206094140

        assumeFalse(isShellTransitionsEnabled)

        super.appLayerReplacesLauncher()

    }

    override fun appLayerReplacesLauncher() = super.appLayerReplacesLauncher()



    /** {@inheritDoc} */

    @Presubmit

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt

+5 −15
Original line number Diff line number Diff line
@@ -96,20 +96,14 @@ class OpenAppWarmTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp 
    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun appWindowReplacesLauncherAsTopWindow() {

        // This test doesn't work in shell transitions because of b/206094140

        assumeFalse(isShellTransitionsEnabled)

    override fun appWindowReplacesLauncherAsTopWindow() =

            super.appWindowReplacesLauncherAsTopWindow()

    }



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        // This test doesn't work in shell transitions because of b/206094140

        assumeFalse(isShellTransitionsEnabled)

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

            super.visibleLayersShownMoreThanOneConsecutiveEntry()

    }



    /** {@inheritDoc} */

    @FlakyTest
@@ -119,11 +113,7 @@ class OpenAppWarmTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp 
    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun appLayerReplacesLauncher() {

        // This test doesn't work in shell transitions because of b/206094140

        assumeFalse(isShellTransitionsEnabled)

        super.appLayerReplacesLauncher()

    }

    override fun appLayerReplacesLauncher() = super.appLayerReplacesLauncher()



    /** {@inheritDoc} */

    @Presubmit