From 47dd2e6f0b2868d9cdac76d4edc6617fbcd47187 Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Thu, 25 Mar 2021 10:27:17 +0100 Subject: [PATCH] Demote unstable assertions from presubmit Test: atest FlickerTests WMShellFlickerTests Bug: 183108736 Bug: 181630910 Bug: 183547024 Bug: 183402546 Change-Id: I5b8d4f9db126bd4c3c9a67327cdfad986f37891b --- .../ime/CloseImeAutoOpenWindowToHomeTest.kt | 2 +- .../wm/flicker/ime/ReOpenImeWindowTest.kt | 2 +- .../wm/flicker/launch/OpenAppColdTest.kt | 8 ++++++++ .../flicker/launch/OpenAppFromOverviewTest.kt | 18 ++++++++++++++++++ .../wm/flicker/launch/OpenAppWarmTest.kt | 14 ++++++++++++++ .../wm/flicker/rotation/RotationTransition.kt | 13 +++++++------ 6 files changed, 49 insertions(+), 8 deletions(-) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt index b25bc997e9ab8..dfb229d54c999 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt @@ -136,7 +136,7 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete @Test fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible() - @Presubmit + @FlakyTest @Test fun visibleLayersShownMoreThanOneConsecutiveEntry() { testSpec.assertLayers { 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 95b1d3c28e472..be0357e826a8e 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 @@ -153,7 +153,7 @@ class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) { testSpec.statusBarLayerRotatesScales(Surface.ROTATION_0, testSpec.config.endRotation) } - @Presubmit + @FlakyTest @Test fun visibleLayersShownMoreThanOneConsecutiveEntry() { testSpec.assertLayers { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt index a9888b1876b77..a3d1395a680a7 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt @@ -16,6 +16,7 @@ package com.android.server.wm.flicker.launch +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -24,6 +25,7 @@ import com.android.server.wm.flicker.helpers.setRotation import com.android.server.wm.flicker.startRotation import com.android.server.wm.flicker.dsl.FlickerBuilder import org.junit.FixMethodOrder +import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters import org.junit.runners.Parameterized @@ -56,6 +58,12 @@ class OpenAppColdTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp } } + @FlakyTest + @Test + override fun visibleLayersShownMoreThanOneConsecutiveEntry() { + super.visibleLayersShownMoreThanOneConsecutiveEntry() + } + companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt index a19a95da021c3..62b9b81ac35d7 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt @@ -80,6 +80,24 @@ class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) : OpenAppTransitio super.navBarLayerRotatesAndScales() } + @FlakyTest + @Test + override fun statusBarLayerRotatesScales() { + super.statusBarLayerRotatesScales() + } + + @FlakyTest + @Test + override fun visibleLayersShownMoreThanOneConsecutiveEntry() { + super.visibleLayersShownMoreThanOneConsecutiveEntry() + } + + @FlakyTest + @Test + override fun focusChanges() { + super.focusChanges() + } + companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt index dcc64c94e0c43..38af8a7d24df3 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt @@ -16,6 +16,7 @@ package com.android.server.wm.flicker.launch +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -24,6 +25,7 @@ import com.android.server.wm.flicker.helpers.setRotation import com.android.server.wm.flicker.startRotation import com.android.server.wm.flicker.dsl.FlickerBuilder import org.junit.FixMethodOrder +import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters import org.junit.runners.Parameterized @@ -61,6 +63,18 @@ class OpenAppWarmTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp } } + @FlakyTest + @Test + override fun focusChanges() { + super.focusChanges() + } + + @FlakyTest + @Test + override fun visibleLayersShownMoreThanOneConsecutiveEntry() { + super.visibleLayersShownMoreThanOneConsecutiveEntry() + } + companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/RotationTransition.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/RotationTransition.kt index 6d2a9238bed5a..f037f084f1722 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/RotationTransition.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/RotationTransition.kt @@ -18,6 +18,7 @@ package com.android.server.wm.flicker.rotation import android.app.Instrumentation import android.platform.test.annotations.Presubmit +import androidx.test.filters.FlakyTest import androidx.test.platform.app.InstrumentationRegistry import com.android.server.wm.flicker.FlickerBuilderProvider import com.android.server.wm.flicker.FlickerTestParameter @@ -79,7 +80,7 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter) testSpec.navBarLayerIsAlwaysVisible() } - @Presubmit + @FlakyTest @Test open fun navBarLayerRotatesAndScales() { testSpec.navBarLayerRotatesAndScales( @@ -98,14 +99,14 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter) testSpec.statusBarLayerIsAlwaysVisible() } - @Presubmit + @FlakyTest @Test open fun statusBarLayerRotatesScales() { testSpec.statusBarLayerRotatesScales( testSpec.config.startRotation, testSpec.config.endRotation) } - @Presubmit + @FlakyTest @Test open fun visibleLayersShownMoreThanOneConsecutiveEntry() { testSpec.assertLayers { @@ -121,7 +122,7 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter) } } - @Presubmit + @FlakyTest @Test open fun noUncoveredRegions() { testSpec.noUncoveredRegions(testSpec.config.startRotation, @@ -134,7 +135,7 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter) testSpec.focusDoesNotChange() } - @Presubmit + @FlakyTest @Test open fun appLayerRotates_StartingPos() { testSpec.assertLayersStart { @@ -142,7 +143,7 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter) } } - @Presubmit + @FlakyTest @Test open fun appLayerRotates_EndingPos() { testSpec.assertLayersEnd {