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

Commit 63be3c89 authored by Chris Li's avatar Chris Li
Browse files

Move disabled shelltransit flicker tests to flaky 

So that we can keep track of the status, and move it back to presubmit
after it becomes stable

Bug: 214452854
Test: pass existing
Change-Id: I60453789676cda9eb0892b601806d398af7bdc82
parent f267dc16

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ class EnterPipToOtherOrientationTest( 
    @Presubmit

    @Test

    fun testAppPlusPipLayerCoversFullScreenOnEnd() {

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

        testSpec.assertLayersEnd {

            val pipRegion = visibleRegion(pipApp.component).region

            visibleRegion(testApp.component)

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipKeyboardTest.kt

+8 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.server.wm.flicker.helpers.setRotation 
import com.android.server.wm.traces.common.FlickerComponentName

import com.android.wm.shell.flicker.helpers.ImeAppHelper

import org.junit.Assume.assumeFalse

import org.junit.Assume.assumeTrue

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -82,6 +83,13 @@ class PipKeyboardTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) 
        super.statusBarLayerRotatesScales()

    }



    @FlakyTest(bugId = 214452854)

    @Test

    fun statusBarLayerRotatesScales_shellTransit() {

        assumeTrue(isShellTransitionsEnabled)

        super.statusBarLayerRotatesScales()

    }



    /**

     * Ensure the pip window remains visible throughout any keyboard interactions

     */

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipLegacySplitScreenTest.kt

+1 −5
Original line number Diff line number Diff line
@@ -92,11 +92,7 @@ class PipLegacySplitScreenTest(testSpec: FlickerTestParameter) : PipTransition(t 
    /** {@inheritDoc}  */

    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerRotatesScales() {

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

        assumeFalse(com.android.server.wm.flicker.helpers.isShellTransitionsEnabled)

        super.statusBarLayerRotatesScales()

    }

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    @FlakyTest(bugId = 161435597)

    @Test

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt

+22 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.server.wm.flicker.annotation.Group4 
import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled

import org.junit.Assume.assumeFalse

import org.junit.Assume.assumeTrue

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -91,6 +92,13 @@ class CloseAppBackButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio 
        super.statusBarLayerRotatesScales()

    }



    @FlakyTest(bugId = 214452854)

    @Test

    fun statusBarLayerRotatesScales_shellTransit() {

        assumeTrue(isShellTransitionsEnabled)

        super.statusBarLayerRotatesScales()

    }



    /** {@inheritDoc} */

    @Presubmit

    @Test
@@ -100,6 +108,13 @@ class CloseAppBackButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio 
        super.launcherLayerReplacesApp()

    }



    @FlakyTest(bugId = 214452854)

    @Test

    fun launcherLayerReplacesApp_shellTransit() {

        assumeTrue(isShellTransitionsEnabled)

        super.launcherLayerReplacesApp()

    }



    /** {@inheritDoc} */

    @Presubmit

    @Test
@@ -109,6 +124,13 @@ class CloseAppBackButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio 
        super.entireScreenCovered()

    }



    @FlakyTest(bugId = 214452854)

    @Test

    fun entireScreenCovered_shellTransit() {

        assumeTrue(isShellTransitionsEnabled)

        super.entireScreenCovered()

    }



    companion object {

        /**

         * Creates the test configurations.

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt

+29 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import com.android.server.wm.flicker.annotation.Group4 
import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled

import org.junit.Assume.assumeFalse

import org.junit.Assume.assumeTrue

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -90,6 +91,13 @@ class CloseAppHomeButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio 
        super.statusBarLayerRotatesScales()

    }



    @FlakyTest(bugId = 214452854)

    @Test

    fun statusBarLayerRotatesScales_shellTransit() {

        assumeTrue(isShellTransitionsEnabled)

        super.statusBarLayerRotatesScales()

    }



    /** {@inheritDoc} */

    @Presubmit

    @Test
@@ -99,6 +107,13 @@ class CloseAppHomeButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio 
        super.launcherLayerReplacesApp()

    }



    @FlakyTest(bugId = 214452854)

    @Test

    fun launcherLayerReplacesApp_shellTransit() {

        assumeTrue(isShellTransitionsEnabled)

        super.launcherLayerReplacesApp()

    }



    /** {@inheritDoc} */

    @Presubmit

    @Test
@@ -108,6 +123,13 @@ class CloseAppHomeButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio 
        super.entireScreenCovered()

    }



    @FlakyTest(bugId = 214452854)

    @Test

    fun entireScreenCovered_shellTransit() {

        assumeTrue(isShellTransitionsEnabled)

        super.entireScreenCovered()

    }



    /** {@inheritDoc} */

    @Presubmit

    @Test
@@ -117,6 +139,13 @@ class CloseAppHomeButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio 
        super.visibleLayersShownMoreThanOneConsecutiveEntry()

    }



    @FlakyTest(bugId = 214452854)

    @Test

    fun visibleLayersShownMoreThanOneConsecutiveEntry_shellTransit() {

        assumeTrue(isShellTransitionsEnabled)

        super.visibleLayersShownMoreThanOneConsecutiveEntry()

    }



    companion object {

        /**

         * Creates the test configurations.