diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 23:07:12 +0000 |
|---|---|---|
| committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 23:07:12 +0000 |
| commit | f5a2775922b5b54f6b226b3280724df811003e14 (patch) | |
| tree | 467a4ee47e69442fe4c11433fd42c5479a0b7856 /android_webview/javatests | |
| parent | 35d0e11689c9e4c25a6b6e36f61924ad3f8334a9 (diff) | |
| download | chromium_src-f5a2775922b5b54f6b226b3280724df811003e14.zip chromium_src-f5a2775922b5b54f6b226b3280724df811003e14.tar.gz chromium_src-f5a2775922b5b54f6b226b3280724df811003e14.tar.bz2 | |
Disable AwContentsClientOnScaleChangedTest#testScaleUp
BUG=175854
TBR=benm@chromium.org
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/12211141
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182052 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/javatests')
| -rw-r--r-- | android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java index ac4d11b..3e9e5c9 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java @@ -7,6 +7,7 @@ package org.chromium.android_webview.test; import android.test.suitebuilder.annotation.SmallTest; import org.chromium.android_webview.AwContents; +import org.chromium.base.test.util.DisabledTest; import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.CallbackHelper; import org.chromium.android_webview.test.util.CommonResources; @@ -54,7 +55,11 @@ public class AwContentsClientOnScaleChangedTest extends AndroidWebViewTestBase { super.tearDown(); } + /* @SmallTest + This test is timing out on ICS bots including cq. See crbug.com/175854. + */ + @DisabledTest public void testScaleUp() throws Throwable { getContentSettingsOnUiThread(mAwContents).setUseWideViewPort(true); loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), |