From 327e1754097a4baf7ae82bde7bec8be8537a6f4c Mon Sep 17 00:00:00 2001 From: Sergey Nikolaienkov Date: Fri, 13 Nov 2020 10:09:54 +0000 Subject: [PATCH] Do not call assumeTrue(isTelevision) in @After Only call assumeTrue(isTelevision) during test setup (@Before), and do not call it in teardown (@After), which causes tests to fail instead of be slipped. Bug: 171520419 Test: atest WMShellFlickerTests Change-Id: I12f72d46a63c497686f0da7c4763ae79bbeb7dcd --- .../src/com/android/wm/shell/flicker/pip/tv/TvPipTestBase.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/tv/TvPipTestBase.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/tv/TvPipTestBase.kt index 75f01c568b69f..d4acae50911b8 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/tv/TvPipTestBase.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/tv/TvPipTestBase.kt @@ -52,7 +52,7 @@ abstract class TvPipTestBase(rotationName: String, rotation: Int) @After open fun tearDown() { - Assume.assumeTrue(isTelevision) + if (!isTelevision) return testApp.forceStop()