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

Commit 6017a8bd authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Temporarily disbale FaaS on legacy Flicker tests 

Bug: 274106034

Test: atest FlickerTests
Change-Id: Iaccbaa1a8f65f11549a6e487c36646812401d6b1
parent 78ad8f00

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt

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



import android.platform.test.annotations.FlakyTest

import android.tools.device.flicker.annotation.FlickerServiceCompatible

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory

import android.tools.device.flicker.legacy.FlickerBuilder

import android.tools.device.flicker.legacy.FlickerTest
@@ -40,20 +39,27 @@ import org.junit.runners.Parameterized 
 *     Launch an app [testApp] and wait animation to complete

 *     Press back button

 * ```

 *

 * To run only the presubmit assertions add: `--

 *

 * ```

 *      --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest

 *      --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Presubmit`

 * ```

 *

 * To run only the postsubmit assertions add: `--

 *

 * ```

 *      --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest

 *      --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Postsubmit`

 * ```

 *

 * To run only the flaky assertions add: `--

 *

 * ```

 *      --module-arg FlickerTests:include-annotation:androidx.test.filters.FlakyTest`

 * ```

 *

 * Notes:

 * ```

 *     1. Some default assertions (e.g., nav bar, status bar and screen covered)
@@ -65,7 +71,6 @@ import org.junit.runners.Parameterized 
 * ```

 */

@RequiresDevice

@FlickerServiceCompatible

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTestCfArm.kt

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.server.wm.flicker.close



import android.tools.device.flicker.annotation.FlickerServiceCompatible

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory

import android.tools.device.flicker.legacy.FlickerTest

import android.tools.device.flicker.legacy.FlickerTestFactory
@@ -25,7 +24,6 @@ import org.junit.runner.RunWith 
import org.junit.runners.MethodSorters

import org.junit.runners.Parameterized



@FlickerServiceCompatible

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt

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



import android.platform.test.annotations.FlakyTest

import android.tools.device.flicker.annotation.FlickerServiceCompatible

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory

import android.tools.device.flicker.legacy.FlickerBuilder

import android.tools.device.flicker.legacy.FlickerTest
@@ -40,20 +39,27 @@ import org.junit.runners.Parameterized 
 *     Launch an app [testApp] and wait animation to complete

 *     Press home button

 * ```

 *

 * To run only the presubmit assertions add: `--

 *

 * ```

 *      --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest

 *      --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Presubmit`

 * ```

 *

 * To run only the postsubmit assertions add: `--

 *

 * ```

 *      --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest

 *      --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Postsubmit`

 * ```

 *

 * To run only the flaky assertions add: `--

 *

 * ```

 *      --module-arg FlickerTests:include-annotation:androidx.test.filters.FlakyTest`

 * ```

 *

 * Notes:

 * ```

 *     1. Some default assertions (e.g., nav bar, status bar and screen covered)
@@ -65,7 +71,6 @@ import org.junit.runners.Parameterized 
 * ```

 */

@RequiresDevice

@FlickerServiceCompatible

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTestCfArm.kt

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.server.wm.flicker.close



import android.tools.device.flicker.annotation.FlickerServiceCompatible

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory

import android.tools.device.flicker.legacy.FlickerTest

import android.tools.device.flicker.legacy.FlickerTestFactory
@@ -25,7 +24,6 @@ import org.junit.runner.RunWith 
import org.junit.runners.MethodSorters

import org.junit.runners.Parameterized



@FlickerServiceCompatible

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIconCfArm.kt

+0 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.server.wm.flicker.launch 


import android.platform.test.annotations.FlakyTest

import android.tools.common.NavBar

import android.tools.device.flicker.annotation.FlickerServiceCompatible

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory

import android.tools.device.flicker.legacy.FlickerTest

import android.tools.device.flicker.legacy.FlickerTestFactory
@@ -29,7 +28,6 @@ import org.junit.runners.MethodSorters 
import org.junit.runners.Parameterized



/** Some assertions will fail because of b/264415996 */

@FlickerServiceCompatible

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)