From c21bbe248ce084f34bc745cf873d086db44132f5 Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Thu, 4 Feb 2021 09:43:42 +0100 Subject: Disable split screen tests at 90 degrees Those tests are right now flaky on flame and cannot be used in presubmit Bug: 175687842 Bug: 179116910 Test: atest WMShellFlickerTests Change-Id: I5e1b3075a63695fed006b2fb134b826447cb8d0c --- .../shell/flicker/legacysplitscreen/EnterSplitScreenDockActivity.kt | 6 +++++- .../shell/flicker/legacysplitscreen/EnterSplitScreenLaunchToSide.kt | 5 ++++- .../flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt | 5 ++++- .../ExitPrimarySplitScreenShowSecondaryFullscreen.kt | 5 ++++- .../shell/flicker/legacysplitscreen/OpenAppToLegacySplitScreen.kt | 5 ++++- 5 files changed, 21 insertions(+), 5 deletions(-) (limited to 'libs') diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenDockActivity.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenDockActivity.kt index 5374bd9f40de..2c29220bf20e 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenDockActivity.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenDockActivity.kt @@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.legacysplitscreen import android.os.Bundle import android.platform.test.annotations.Presubmit +import android.view.Surface import androidx.test.filters.RequiresDevice import androidx.test.platform.app.InstrumentationRegistry import com.android.server.wm.flicker.FlickerTestRunner @@ -47,6 +48,7 @@ import org.junit.runners.Parameterized @RequiresDevice @RunWith(Parameterized::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) +// @FlakyTest(bugId = 179116910) class EnterSplitScreenDockActivity( testSpec: FlickerTestRunnerFactory.TestSpec ) : FlickerTestRunner(testSpec) { @@ -92,7 +94,9 @@ class EnterSplitScreenDockActivity( } return FlickerTestRunnerFactory.getInstance().buildTest( instrumentation, defaultTransitionSetup, testSpec, - repetitions = SplitScreenHelper.TEST_REPETITIONS) + repetitions = SplitScreenHelper.TEST_REPETITIONS, + supportedRotations = listOf(Surface.ROTATION_0) // bugId = 179116910 + ) } } } \ No newline at end of file diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenLaunchToSide.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenLaunchToSide.kt index d750403d66c6..903971ea084f 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenLaunchToSide.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenLaunchToSide.kt @@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.legacysplitscreen import android.os.Bundle import android.platform.test.annotations.Presubmit +import android.view.Surface import androidx.test.filters.RequiresDevice import androidx.test.platform.app.InstrumentationRegistry import com.android.server.wm.flicker.FlickerTestRunner @@ -96,7 +97,9 @@ class EnterSplitScreenLaunchToSide( } return FlickerTestRunnerFactory.getInstance().buildTest( instrumentation, defaultTransitionSetup, testSpec, - repetitions = SplitScreenHelper.TEST_REPETITIONS) + repetitions = SplitScreenHelper.TEST_REPETITIONS, + supportedRotations = listOf(Surface.ROTATION_0) // bugId = 175687842 + ) } } } \ No newline at end of file diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt index 7782364636f1..493366553623 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt @@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.legacysplitscreen import android.os.Bundle import android.platform.test.annotations.Presubmit +import android.view.Surface import androidx.test.filters.RequiresDevice import androidx.test.platform.app.InstrumentationRegistry import com.android.server.wm.flicker.DOCKED_STACK_DIVIDER @@ -86,7 +87,9 @@ class ExitLegacySplitScreenFromBottom( } return FlickerTestRunnerFactory.getInstance().buildTest( instrumentation, defaultTransitionSetup, testSpec, - repetitions = SplitScreenHelper.TEST_REPETITIONS) + repetitions = SplitScreenHelper.TEST_REPETITIONS, + supportedRotations = listOf(Surface.ROTATION_0) // bugId = 175687842 + ) } } } \ No newline at end of file diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitPrimarySplitScreenShowSecondaryFullscreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitPrimarySplitScreenShowSecondaryFullscreen.kt index 59f6aaf7dd6a..ff3a979717f2 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitPrimarySplitScreenShowSecondaryFullscreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitPrimarySplitScreenShowSecondaryFullscreen.kt @@ -17,6 +17,7 @@ package com.android.wm.shell.flicker.legacysplitscreen import android.os.Bundle +import android.view.Surface import androidx.test.filters.RequiresDevice import androidx.test.platform.app.InstrumentationRegistry import com.android.server.wm.flicker.FlickerTestRunner @@ -87,7 +88,9 @@ class ExitPrimarySplitScreenShowSecondaryFullscreen( } return FlickerTestRunnerFactory.getInstance().buildTest( instrumentation, defaultTransitionSetup, testSpec, - repetitions = SplitScreenHelper.TEST_REPETITIONS) + repetitions = SplitScreenHelper.TEST_REPETITIONS, + supportedRotations = listOf(Surface.ROTATION_0) // bugId = 179116910 + ) } } } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/OpenAppToLegacySplitScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/OpenAppToLegacySplitScreen.kt index c802ffef204f..7edef9314941 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/OpenAppToLegacySplitScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/OpenAppToLegacySplitScreen.kt @@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.legacysplitscreen import android.os.Bundle import android.platform.test.annotations.Presubmit +import android.view.Surface import androidx.test.filters.RequiresDevice import androidx.test.platform.app.InstrumentationRegistry import com.android.server.wm.flicker.FlickerTestRunner @@ -93,7 +94,9 @@ class OpenAppToLegacySplitScreen( } return FlickerTestRunnerFactory.getInstance().buildTest( instrumentation, defaultTransitionSetup, testSpec, - repetitions = SplitScreenHelper.TEST_REPETITIONS) + repetitions = SplitScreenHelper.TEST_REPETITIONS, + supportedRotations = listOf(Surface.ROTATION_0) // bugId = 179116910 + ) } } } -- cgit v1.2.3-59-g8ed1b