From 32993ceccc58847833b6910fd1085dcc8ffac67b Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Tue, 24 Jan 2023 19:05:39 +0000 Subject: [PATCH] Disable OpenAppNonResizeableTest on shell Bug: 265009763 Test: atest OpenAppNonResizeableTest Change-Id: I6ffd5f8e1ad70b94e30a8887e75b1db01eb25a51 --- .../server/wm/flicker/launch/OpenAppNonResizeableTest.kt | 9 +++++++++ 1 file changed, 9 insertions(+) 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 7cfe87904dc3c..8154b168b8eba 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 @@ -24,10 +24,12 @@ import com.android.server.wm.flicker.FlickerTest import com.android.server.wm.flicker.FlickerTestFactory import com.android.server.wm.flicker.annotation.FlickerServiceCompatible import com.android.server.wm.flicker.helpers.NonResizeableAppHelper +import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory import com.android.server.wm.traces.common.ComponentNameMatcher import com.android.server.wm.traces.common.service.PlatformConsts import org.junit.Assume +import org.junit.Before import org.junit.FixMethodOrder import org.junit.Ignore import org.junit.Test @@ -65,6 +67,13 @@ import org.junit.runners.Parameterized open class OpenAppNonResizeableTest(flicker: FlickerTest) : OpenAppFromLockTransition(flicker) { override val testApp = NonResizeableAppHelper(instrumentation) + @Before + open fun before() { + // b/266384300 - The test causes the keyguard occluded state to be incorrect, disable + // it while enabling shell transitions + Assume.assumeFalse(isShellTransitionsEnabled) + } + /** * Checks that the [ComponentNameMatcher.NAV_BAR] layer starts invisible, becomes visible during * unlocking animation and remains visible at the end