diff options
author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-01 21:28:57 +0000 |
---|---|---|
committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-01 21:28:57 +0000 |
commit | 95bf2a744fbaf237c0cd80c16872e0c6d1eeb0d8 (patch) | |
tree | b81b116bd236f1daef21936005ea97c90a089bd0 /android_webview/javatests | |
parent | 23d951f5824da20e311c088a35068529002b87fc (diff) | |
download | chromium_src-95bf2a744fbaf237c0cd80c16872e0c6d1eeb0d8.zip chromium_src-95bf2a744fbaf237c0cd80c16872e0c6d1eeb0d8.tar.gz chromium_src-95bf2a744fbaf237c0cd80c16872e0c6d1eeb0d8.tar.bz2 |
Disable ContentViewZoomTest#testZoomControls
This test is flaky. See bug for details.
BUG=153522
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/14786009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197721 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/javatests')
-rw-r--r-- | android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java index 2cadb70..ccf9603 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java @@ -13,6 +13,7 @@ import android.view.ViewConfiguration; import org.chromium.android_webview.AwContents; import org.chromium.android_webview.AwSettings; import org.chromium.base.ThreadUtils; +import org.chromium.base.test.util.DisabledTest; import org.chromium.base.test.util.Feature; import org.chromium.content.browser.ContentSettings; import org.chromium.content.browser.ContentViewCore; @@ -220,8 +221,12 @@ public class ContentViewZoomTest extends AwTestBase { assertFalse(isMultiTouchZoomSupportedOnUiThread()); } + /* @SmallTest @Feature({"AndroidWebView"}) + This test is flaky. See crbug.com/153522. + */ + @DisabledTest public void testZoomControls() throws Throwable { AwSettings webSettings = getAwSettingsOnUiThread(mAwContents); loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), |