From 006db80dae22e1be5c15ea7c6c5c604fd7f5b793 Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Tue, 26 May 2020 11:31:50 +0200 Subject: [PATCH 1/2] Enable previously flaky IME related tests The IME layer is sometimes present but hidden on the hierarchy. The tests should ignore this condition (skip until first assertion) to ensure the tests are no longer flaky. Test: atest FlickerTests Change-Id: Ie1c9daf006eac215d310cfbb66df96501e910b5f --- .../android/server/wm/flicker/CloseImeWindowToHomeTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToHomeTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToHomeTest.java index b2dd959ce9b2a..36f4ba3b79250 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToHomeTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToHomeTest.java @@ -24,7 +24,6 @@ import androidx.test.filters.LargeTest; import com.android.server.wm.flicker.helpers.ImeAppHelper; import org.junit.FixMethodOrder; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; @@ -62,20 +61,20 @@ public class CloseImeWindowToHomeTest extends NonRotationTestBase { .forAllEntries()); } - @Ignore("Flaky") @Test public void checkVisibility_imeLayerBecomesInvisible() { checkResults(result -> LayersTraceSubject.assertThat(result) + .skipUntilFirstAssertion() .showsLayer(IME_WINDOW_TITLE) .then() .hidesLayer(IME_WINDOW_TITLE) .forAllEntries()); } - @Ignore("Flaky") @Test public void checkVisibility_imeAppLayerBecomesInvisible() { checkResults(result -> LayersTraceSubject.assertThat(result) + .skipUntilFirstAssertion() .showsLayer(mTestApp.getPackage()) .then() .hidesLayer(mTestApp.getPackage()) From 91c6d18f97d37f6996b4441d251eafb670d1c198 Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Tue, 26 May 2020 12:28:54 +0200 Subject: [PATCH 2/2] Disable test for window IME visibility when IME is shown on app launch This test is flaky due to b/157449248 and b/157450044 Test: atest FlickerTests Change-Id: I29ee4351421db2676d1f1dd0aad4150e874b708c --- .../wm/flicker/CloseImeAutoOpenWindowToHomeTest.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeAutoOpenWindowToHomeTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeAutoOpenWindowToHomeTest.java index e463fd177590f..7f610a695e7e9 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeAutoOpenWindowToHomeTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeAutoOpenWindowToHomeTest.java @@ -65,4 +65,11 @@ public class CloseImeAutoOpenWindowToHomeTest extends CloseImeWindowToHomeTest { public void checkVisibility_imeLayerBecomesInvisible() { super.checkVisibility_imeLayerBecomesInvisible(); } + + @FlakyTest(bugId = 157449248) + @Ignore("Waiting bug feedback") + @Test + public void checkVisibility_imeAppWindowBecomesInvisible() { + super.checkVisibility_imeAppWindowBecomesInvisible(); + } }