Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9225ea1 authored Apr 06, 2022 by Pablo Gamito Committed by Automerger Merge Worker Apr 06, 2022

Merge "Demote flaky flicker tests" into tm-dev am: 12b486a3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17606694

Change-Id: I149e716db8bd49cd133fbd8e61b027dff535ca56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents cd5c905a 12b486a3

tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeAndDialogThemeAppTest.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -79,7 +79,7 @@ class LaunchAppShowImeAndDialogThemeAppTest(private val testSpec: FlickerTestPar
	/**		/**
	* Checks that [FlickerComponentName.IME] layer is visible at the end of the transition		* Checks that [FlickerComponentName.IME] layer is visible at the end of the transition
	*/		*/
	@Presubmit		@FlakyTest(bugId = 227142436)
	@Test		@Test
	fun imeLayerExistsEnd() {		fun imeLayerExistsEnd() {
	testSpec.assertLayersEnd {		testSpec.assertLayersEnd {

tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest_ShellTransit.kt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	package com.android.server.wm.flicker.quickswitch		package com.android.server.wm.flicker.quickswitch

	import android.platform.test.annotations.RequiresDevice		import android.platform.test.annotations.RequiresDevice
			import androidx.test.filters.FlakyTest
	import com.android.server.wm.flicker.FlickerParametersRunnerFactory		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
	import com.android.server.wm.flicker.FlickerTestParameter		import com.android.server.wm.flicker.FlickerTestParameter
	import com.android.server.wm.flicker.annotation.Group1		import com.android.server.wm.flicker.annotation.Group1
	@@ -44,6 +45,7 @@ import org.junit.runners.Parameterized
	@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
	@FixMethodOrder(MethodSorters.NAME_ASCENDING)		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
	@Group1		@Group1
			@FlakyTest(bugId = 228009808)
	open class QuickSwitchBetweenTwoAppsForwardTest_ShellTransit(testSpec: FlickerTestParameter)		open class QuickSwitchBetweenTwoAppsForwardTest_ShellTransit(testSpec: FlickerTestParameter)
	: QuickSwitchBetweenTwoAppsForwardTest(testSpec) {		: QuickSwitchBetweenTwoAppsForwardTest(testSpec) {
	@Before		@Before