Merge "Disable flaky flicker tests" into tm-dev

This commit is contained in:
TreeHugger Robot
2022-04-21 14:14:22 +00:00
committed by Android (Google) Code Review
3 changed files with 35 additions and 0 deletions

View File

@@ -74,6 +74,17 @@ open class OpenAppFromLockNotificationCold(testSpec: FlickerTestParameter)
@Test
override fun entireScreenCovered() = super.entireScreenCovered()
/** {@inheritDoc} */
@FlakyTest(bugId = 203538234)
@Test
override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =
super.visibleWindowsShownMoreThanOneConsecutiveEntry()
/** {@inheritDoc} */
@FlakyTest(bugId = 203538234)
@Test
override fun appWindowBecomesTopWindow() = super.appWindowBecomesTopWindow()
companion object {
/**
* Creates the test configurations.

View File

@@ -105,6 +105,12 @@ open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter)
@Test
override fun entireScreenCovered() = super.entireScreenCovered()
/** {@inheritDoc} */
@FlakyTest(bugId = 203538234)
@Test
override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =
super.visibleWindowsShownMoreThanOneConsecutiveEntry()
companion object {
/**
* Creates the test configurations.

View File

@@ -20,6 +20,7 @@ import android.platform.test.annotations.Postsubmit
import android.platform.test.annotations.RequiresDevice
import android.view.WindowInsets
import android.view.WindowManager
import androidx.test.filters.FlakyTest
import androidx.test.uiautomator.By
import androidx.test.uiautomator.Until
import com.android.launcher3.tapl.LauncherInstrumentation
@@ -29,8 +30,10 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory
import com.android.server.wm.flicker.annotation.Group1
import com.android.server.wm.flicker.dsl.FlickerBuilder
import com.android.server.wm.flicker.helpers.NotificationAppHelper
import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled
import com.android.server.wm.flicker.helpers.setRotation
import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen
import org.junit.Assume
import org.junit.FixMethodOrder
import org.junit.Test
import org.junit.runner.RunWith
@@ -162,6 +165,21 @@ open class OpenAppFromNotificationWarm(testSpec: FlickerTestParameter)
}
}
/** {@inheritDoc} */
@Postsubmit
@Test
override fun appWindowBecomesTopWindow() {
Assume.assumeFalse(isShellTransitionsEnabled)
super.appWindowBecomesTopWindow()
}
@FlakyTest(bugId = 229738092)
@Test
fun appWindowBecomesTopWindow_ShellTransit() {
Assume.assumeTrue(isShellTransitionsEnabled)
super.appWindowBecomesTopWindow()
}
companion object {
/**
* Creates the test configurations.