summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authoryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-27 23:41:34 +0000
committeryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-27 23:41:34 +0000
commit897836f1901e70c27ff1d6cba5190be7cef2b049 (patch)
treeb12c8e8cc43a3a03167fa42ed4ba3fff641fccc3 /content
parent351b8ce557442d01e67321bcf33566bc071902bf (diff)
downloadchromium_src-897836f1901e70c27ff1d6cba5190be7cef2b049.zip
chromium_src-897836f1901e70c27ff1d6cba5190be7cef2b049.tar.gz
chromium_src-897836f1901e70c27ff1d6cba5190be7cef2b049.tar.bz2
Mark ContentViewScrollingTest#testFling and ContentViewMiscTest#testFlingScroll flaky
Look to be flaky after the roll. BUG=162967 TBR=joth@chromium.org NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11418194 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169796 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
index bb3f054..4e14004 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
@@ -4,7 +4,7 @@
package org.chromium.content.browser;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.test.FlakyTest;
import org.chromium.base.test.util.Feature;
import org.chromium.content_shell.ContentShellTestBase;
@@ -20,8 +20,12 @@ public class ContentViewScrollingTest extends ContentShellTestBase {
+ "<body>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</body>"
+ "</html>";
- @SmallTest
- @Feature({"Android-WebView"})
+ /*
+ * @SmallTest
+ * @Feature({"Android-WebView"})
+ * BUG 162967
+ */
+ @FlakyTest
public void testFling() throws Throwable {
launchContentShellWithUrl(LARGE_PAGE);
waitForActiveShellToBeDoneLoading();