From 52eb6ffa5525d8ad5f69275d02f63a2eacc975e6 Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Thu, 25 Feb 2021 09:57:00 +0100 Subject: [PATCH] Promote stable app pairs tests Promote stable postsubmit and flaky tests to presubmit Test: atest WMShellFlickerTests Bug: 171049720 Change-Id: I7eff620e56b6c2ccf2704ffbf1576b766cbe4403 --- .../apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt | 6 +++--- ...tateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt | 13 ++----------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt index eb53783f32f75..5f003ba62b2d9 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt @@ -71,16 +71,16 @@ class RotateTwoLaunchedAppsInAppPairsMode( } } - @FlakyTest + @Presubmit @Test fun appPairsDividerIsVisible() = testSpec.appPairsDividerIsVisible() - @FlakyTest + @Presubmit @Test fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales(Surface.ROTATION_0, testSpec.config.endRotation) - @FlakyTest + @Presubmit @Test fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales(Surface.ROTATION_0, testSpec.config.endRotation) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt index 39c94842fe6e5..d4792088ac31a 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt @@ -76,17 +76,8 @@ class RotateTwoLaunchedAppsRotateAndEnterAppPairsMode( @Presubmit @Test - fun navBarLayerRotatesAndScales() { - Assume.assumeFalse(isRotated) - testSpec.navBarLayerRotatesAndScales(Surface.ROTATION_0, testSpec.config.endRotation) - } - - @FlakyTest - @Test - fun navBarLayerRotatesAndScales_Flaky() { - Assume.assumeTrue(isRotated) - testSpec.navBarLayerRotatesAndScales(Surface.ROTATION_0, testSpec.config.endRotation) - } + fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales( + Surface.ROTATION_0, testSpec.config.endRotation) @Presubmit @Test