summaryrefslogtreecommitdiffstats
path: root/android_webview/javatests
diff options
context:
space:
mode:
authorboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-15 18:16:41 +0000
committerboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-15 18:16:41 +0000
commitba2a2faae234e9a980388193c44b416cfc7434ce (patch)
tree8b392e382de75731c76487e1ed3a29e5ce8c39ef /android_webview/javatests
parent8e86d7c6cfd6cd101d5b461cb1f09651b790b8ee (diff)
downloadchromium_src-ba2a2faae234e9a980388193c44b416cfc7434ce.zip
chromium_src-ba2a2faae234e9a980388193c44b416cfc7434ce.tar.gz
chromium_src-ba2a2faae234e9a980388193c44b416cfc7434ce.tar.bz2
Disable broken zoom instrumentation test
This test was only passing before because we were not plumming view events to ContentViewCore, but this changed after r167797. This exposed the legitimate failure that viewport is currently broken and thus this test started failing. BUG=160861 Java only change to disable a test. fyi bot compiles. NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11348072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/javatests')
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java10
1 files changed, 8 insertions, 2 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 b9bfd5b..9e3c26f 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
@@ -280,8 +280,14 @@ public class ContentViewZoomTest extends AndroidWebViewTestBase {
assertEquals(View.VISIBLE, zoomControls.getVisibility());
}
- @SmallTest
- @Feature({"AndroidWebView"})
+ /*
+ * @SmallTest
+ * @Feature({"AndroidWebView"})
+ * crbug.com/160861
+ * This test relies on <meta name="viewport"> working properly, which is
+ * broken at the moment.
+ */
+ @DisabledTest
public void testZoomControlsOnNonZoomableContent() throws Throwable {
ContentSettings webSettings = getContentSettingsOnUiThread(mAwContents);
loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),