Commit ce3de2d3 authored by Xing Liu's avatar Xing Liu Committed by Commit Bot

Download location: enable flaky tests in DownloadActivityTest.

The CL that causes the flakiness has been reverted. See:
https://chromium-review.googlesource.com/c/chromium/src/+/1112777
Landed as e4144ed1.

This CL enables flaky tests in DownloadActivityTest.

TBR=dtrainor@chromium.org

Bug: 855389,855219,855168,855167
Change-Id: Id53085ed71c5188cd1e7588998bda6f00c7b89a5
Reviewed-on: https://chromium-review.googlesource.com/1113910Reviewed-by: default avatarXing Liu <xingliu@chromium.org>
Commit-Queue: Xing Liu <xingliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570107}
parent 375f8e1a
......@@ -28,8 +28,6 @@ import org.junit.runner.RunWith;
import org.chromium.base.ContextUtils;
import org.chromium.base.ThreadUtils;
import org.chromium.base.test.util.CallbackHelper;
import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.FlakyTest;
import org.chromium.base.test.util.Restriction;
import org.chromium.base.test.util.RetryOnFailure;
import org.chromium.chrome.R;
......@@ -160,7 +158,6 @@ public class DownloadActivityTest {
@Test
@MediumTest
@FlakyTest(message = "crbug.com/855168")
public void testSpaceDisplay() throws Exception {
// This first check is a Criteria because initialization of the Adapter is asynchronous.
CriteriaHelper.pollUiThread(new Criteria() {
......@@ -220,7 +217,6 @@ public class DownloadActivityTest {
}
/** Clicking on filters affects various things in the UI. */
@DisabledTest(message = "crbug.com/855389")
@Test
@MediumTest
public void testFilters() throws Exception {
......@@ -255,7 +251,6 @@ public class DownloadActivityTest {
@Test
@MediumTest
@RetryOnFailure
@FlakyTest(message = "crbug.com/854241")
public void testDeleteFiles() throws Exception {
SnackbarManager.setDurationForTesting(1);
......@@ -295,7 +290,6 @@ public class DownloadActivityTest {
@Test
@MediumTest
@RetryOnFailure
@FlakyTest(message = "crbug.com/855219")
public void testDeleteFileFromMenu() throws Exception {
SnackbarManager.setDurationForTesting(1);
......@@ -327,7 +321,6 @@ public class DownloadActivityTest {
Assert.assertEquals("5.00 GB downloaded", mSpaceUsedDisplay.getText());
}
@DisabledTest(message = "crbug.com/855389")
@Test
@MediumTest
@RetryOnFailure
......@@ -398,7 +391,6 @@ public class DownloadActivityTest {
Assert.assertEquals("6.50 GB downloaded", mSpaceUsedDisplay.getText());
}
@DisabledTest(message = "crbug.com/855389")
@Test
@MediumTest
@RetryOnFailure
......@@ -464,7 +456,6 @@ public class DownloadActivityTest {
Assert.assertEquals("6.50 GB downloaded", mSpaceUsedDisplay.getText());
}
@DisabledTest(message = "crbug.com/855389")
@Test
@MediumTest
@RetryOnFailure
......@@ -530,7 +521,6 @@ public class DownloadActivityTest {
@Test
@MediumTest
@DisableFeatures("OfflinePagesSharing")
@FlakyTest(message = "crbug.com/855167")
public void testShareFiles() throws Exception {
// Adapter positions:
// 0 = space display
......@@ -605,7 +595,6 @@ public class DownloadActivityTest {
// TODO(carlosk): OfflineItems used here come from StubbedProvider so this might not be the best
// place to test peer-2-peer sharing.
@DisabledTest(message = "crbug.com/855389")
@Test
@MediumTest
@EnableFeatures("OfflinePagesSharing")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment