commit 36810e70021a3062da07590decba9d5515209fe4
author Mady Mellor <madym@google.com> Wed Jun 16 19:16:48 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 16 19:16:48 2021 +0000
tree df8bc60c41335e47428ee06513c3fa294895bd25
parent 3ea5e5d03e06c47bcbf316576b0ac5518e3ae984
parent 179fce0fb594602a19ee5f6b4c418aa56b1d4a2d

Merge "ignore a flaky test" into sc-dev

packages/SystemUI/tests/src/com/android/systemui/people/widget/LaunchConversationActivityTest.java

diff --git a/packages/SystemUI/tests/src/com/android/systemui/people/widget/LaunchConversationActivityTest.java b/packages/SystemUI/tests/src/com/android/systemui/people/widget/LaunchConversationActivityTest.java
index 5f4d90b..f6264ff 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/people/widget/LaunchConversationActivityTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/people/widget/LaunchConversationActivityTest.java
@@ -49,6 +49,7 @@
 import com.android.wm.shell.bubbles.Bubble;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -213,6 +214,7 @@
         verify(mBubblesManager, never()).expandStackAndSelectBubble(any(NotificationEntry.class));
     }
 
+    @Ignore
     @Test
     public void testBubbleWithNoNotifOpensBubble() throws Exception {
         Bubble bubble = mock(Bubble.class);