From a4ac3869da536f4dd373012e9b0a067ad5f7f4aa Mon Sep 17 00:00:00 2001 From: Wale Ogunwale Date: Tue, 19 Mar 2019 07:08:29 -0700 Subject: [PATCH] Move some no longer flaky tests to pre-submit Bug: 124127512 Bug: 123654474 Test: self Change-Id: I3fa53f0268d225d8e44b652a8bbf877531154244 --- .../android/server/wm/AnimatingAppWindowTokenRegistryTest.java | 1 - .../src/com/android/server/wm/TaskStackChangedListenerTest.java | 1 - .../wmtests/src/com/android/server/wm/WindowStateTests.java | 2 -- 3 files changed, 4 deletions(-) diff --git a/services/tests/wmtests/src/com/android/server/wm/AnimatingAppWindowTokenRegistryTest.java b/services/tests/wmtests/src/com/android/server/wm/AnimatingAppWindowTokenRegistryTest.java index 5556a150cf3ad..febb79540fea9 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AnimatingAppWindowTokenRegistryTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/AnimatingAppWindowTokenRegistryTest.java @@ -43,7 +43,6 @@ import org.mockito.MockitoAnnotations; */ @SmallTest @Presubmit -@FlakyTest(detail = "Promote once confirmed non-flaky") public class AnimatingAppWindowTokenRegistryTest extends WindowTestsBase { @Mock diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskStackChangedListenerTest.java b/services/tests/wmtests/src/com/android/server/wm/TaskStackChangedListenerTest.java index b9e9909c2dc9b..d8a01b9eb9b49 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskStackChangedListenerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskStackChangedListenerTest.java @@ -159,7 +159,6 @@ public class TaskStackChangedListenerTest { * Tests for onTaskCreated, onTaskMovedToFront, onTaskRemoved and onTaskRemovalStarted. */ @Test - @FlakyTest(detail = "Promote to presubmit when shown to be stable.") public void testTaskChangeCallBacks() throws Exception { final Object[] params = new Object[2]; final CountDownLatch taskCreatedLaunchLatch = new CountDownLatch(1); diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java index b03f63b9159f6..4f8fe5b10f19f 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java @@ -87,7 +87,6 @@ import java.util.LinkedList; */ @SmallTest @Presubmit -@FlakyTest(bugId = 124127512) public class WindowStateTests extends WindowTestsBase { private static int sPreviousNewInsetsMode; @@ -363,7 +362,6 @@ public class WindowStateTests extends WindowTestsBase { assertFalse(app.canAffectSystemUiFlags()); } - @FlakyTest(detail = "Promote to presubmit when shown to be stable.") @Test public void testVisibleWithInsetsProvider() throws Exception { final WindowState topBar = createWindow(null, TYPE_STATUS_BAR, "topBar");