Commit 4a5e5e8a authored by Gang Wu's avatar Gang Wu Committed by Commit Bot

Revert "Increase the timeout for criteria check"

This reverts commit 3f46dedb.

Reason for revert: The test is still flaky

Original change's description:
> Increase the timeout for criteria check
> 
> From previous enabled test run,
> https://test-results.appspot.com/dashboards/flakiness_dashboard.html#testType=content_shell_test_apk&tests=ClipboardTest%23testCopyDocumentFragment
> It seems most of failure happened on slow devices, like x86.
> So increase the timeout for CriteriaHelper.pollUiThread().
> 
> Bug: 791021
> Change-Id: I89430d2fbf89196a3813b1e175d2fd56090e079b
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2144814
> Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
> Commit-Queue: Gang Wu <gangwu@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#758050}

TBR=yfriedman@chromium.org,gangwu@chromium.org

Change-Id: Ie5e138111645d19193b319ae1210b863fe721000
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 791021
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2146073Reviewed-by: default avatarGang Wu <gangwu@chromium.org>
Commit-Queue: Gang Wu <gangwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#758308}
parent 4c60cf56
...@@ -17,6 +17,7 @@ import org.junit.Test; ...@@ -17,6 +17,7 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.chromium.base.test.BaseJUnit4ClassRunner; import org.chromium.base.test.BaseJUnit4ClassRunner;
import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.UrlUtils; import org.chromium.base.test.util.UrlUtils;
import org.chromium.content.browser.webcontents.WebContentsImpl; import org.chromium.content.browser.webcontents.WebContentsImpl;
...@@ -60,6 +61,7 @@ public class ClipboardTest { ...@@ -60,6 +61,7 @@ public class ClipboardTest {
@LargeTest @LargeTest
@Feature({"Clipboard", "TextInput"}) @Feature({"Clipboard", "TextInput"})
@RerunWithUpdatedContainerView @RerunWithUpdatedContainerView
@DisabledTest(message = "https://crbug.com/791021")
public void testCopyDocumentFragment() { public void testCopyDocumentFragment() {
ClipboardManager clipboardManager = ClipboardManager clipboardManager =
TestThreadUtils.runOnUiThreadBlockingNoException(new Callable<ClipboardManager>() { TestThreadUtils.runOnUiThreadBlockingNoException(new Callable<ClipboardManager>() {
...@@ -86,7 +88,7 @@ public class ClipboardTest { ...@@ -86,7 +88,7 @@ public class ClipboardTest {
public boolean isSatisfied() { public boolean isSatisfied() {
return hasPrimaryClip(clipboardManager); return hasPrimaryClip(clipboardManager);
} }
}, CriteriaHelper.DEFAULT_MAX_TIME_TO_POLL * 5, CriteriaHelper.DEFAULT_POLLING_INTERVAL); });
// Verify that the data on the clipboard is what we expect it to be. For Android JB MR2 // Verify that the data on the clipboard is what we expect it to be. For Android JB MR2
// and higher we expect HTML content, for other versions the plain-text representation. // and higher we expect HTML content, for other versions the plain-text representation.
......
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