Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add FlakyTest annotation to unblock presubmit

Browse Source 
Also move the non-flaky test back to presubmit.

Fix: 263148628
Bug: 263213649
Test: atest WMShellFlickerTests:DragDividerToResize
Change-Id: I2065ae54d536bf7a7eabdb7a920edc76fe32aeb9
This commit is contained in:
Chilun Huang
2022-12-20 16:12:53 +08:00
parent 384234e289
commit b31914536e
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DragDividerToResize.kt
View File

@@ -24,6 +24,7 @@ import androidx.test.filters.RequiresDevice
import com.android.server.wm.flicker.FlickerBuilder
import com.android.server.wm.flicker.FlickerTest
import com.android.server.wm.flicker.FlickerTestFactory
import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled
import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory
import com.android.wm.shell.flicker.SPLIT_SCREEN_DIVIDER_COMPONENT
import com.android.wm.shell.flicker.appWindowIsVisibleAtEnd
@@ -98,7 +99,17 @@ class DragDividerToResize(flicker: FlickerTest) : SplitScreenBase(flicker) {
}
}
@Presubmit @Test fun primaryAppWindowKeepVisible() = flicker.appWindowKeepVisible(primaryApp)
@Presubmit
@Test fun primaryAppWindowKeepVisible() {
Assume.assumeFalse(isShellTransitionsEnabled)
flicker.appWindowKeepVisible(primaryApp)
}
@FlakyTest(bugId = 263213649)
@Test fun primaryAppWindowKeepVisible_ShellTransit() {
Assume.assumeTrue(isShellTransitionsEnabled)
flicker.appWindowKeepVisible(primaryApp)
}
@Presubmit
@Test
@@ -106,14 +117,27 @@ class DragDividerToResize(flicker: FlickerTest) : SplitScreenBase(flicker) {
@Presubmit
@Test
fun primaryAppBoundsChanges() =
fun primaryAppBoundsChanges() {
Assume.assumeFalse(isShellTransitionsEnabled)
flicker.splitAppLayerBoundsChanges(
primaryApp,
landscapePosLeft = true,
portraitPosTop = false
)
}
@FlakyTest(bugId = 250530664)
@FlakyTest(bugId = 263213649)
@Test
fun primaryAppBoundsChanges_ShellTransit() {
Assume.assumeTrue(isShellTransitionsEnabled)
flicker.splitAppLayerBoundsChanges(
primaryApp,
landscapePosLeft = true,
portraitPosTop = false
)
}
@Presubmit
@Test
fun secondaryAppBoundsChanges() =
flicker.splitAppLayerBoundsChanges(