Merge "Revert "Disabled presubmit for flakey test""

This commit is contained in:
TreeHugger Robot
2018-02-23 20:18:23 +00:00
committed by Android (Google) Code Review

View File

@@ -26,7 +26,6 @@ import android.app.RemoteInput;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.res.Resources;
import android.support.test.filters.FlakyTest;
import android.support.test.filters.SmallTest;
import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper;
@@ -77,7 +76,6 @@ public class SmartReplyViewTest extends SysuiTestCase {
mSpacing = res.getDimensionPixelSize(R.dimen.smart_reply_button_spacing);
}
@FlakyTest
@Test
public void testSendSmartReply_intentContainsResultsAndSource() throws InterruptedException {
setRepliesFromRemoteInput(TEST_CHOICES);
@@ -182,7 +180,6 @@ public class SmartReplyViewTest extends SysuiTestCase {
assertEqualLayouts(expectedView.getChildAt(2), mView.getChildAt(2));
}
@FlakyTest
@Test
public void testMeasure_choiceWithThreeLines() {
final CharSequence[] choices = new CharSequence[]{"Hi", "Hello\nevery\nbody", "Bye"};