From 897836f1901e70c27ff1d6cba5190be7cef2b049 Mon Sep 17 00:00:00 2001 From: "yfriedman@chromium.org" Date: Tue, 27 Nov 2012 23:41:34 +0000 Subject: 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 --- .../org/chromium/content/browser/ContentViewScrollingTest.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'content') 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 { + "Lorem ipsum dolor sit amet, consectetur adipiscing elit." + ""; - @SmallTest - @Feature({"Android-WebView"}) + /* + * @SmallTest + * @Feature({"Android-WebView"}) + * BUG 162967 + */ + @FlakyTest public void testFling() throws Throwable { launchContentShellWithUrl(LARGE_PAGE); waitForActiveShellToBeDoneLoading(); -- cgit v1.1