From 0b02f4473737e37821dae6679793655d5e4610a1 Mon Sep 17 00:00:00 2001 From: Sky Malice Date: Fri, 16 Oct 2020 21:18:30 +0000 Subject: [PATCH] Disable failing android webview quirk tests that assume 300 width. TBR: michaelbai@chromium.org Bug: 1133535 Change-Id: I3bb2ac2dbbd3e9349afca8603de90521ddf0f5ab Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2481009 Reviewed-by: Sky Malice Commit-Queue: Sky Malice Cr-Commit-Position: refs/heads/master@{#818098} --- .../org/chromium/android_webview/test/AwLegacyQuirksTest.java | 2 ++ .../src/org/chromium/android_webview/test/AwSettingsTest.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java index bd17d479e4e771..6b67f2bf83476d 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java @@ -210,6 +210,7 @@ public void testScreenSizeInPhysicalPixelsQuirk() throws Throwable { @Test @MediumTest @Feature({"AndroidWebView"}) + @DisabledTest(message = "https://crbug.com/1133535") public void testMetaMergeContentQuirk() throws Throwable { final TestAwContentsClient contentClient = new TestAwContentsClient(); final AwTestContainerView testContainerView = @@ -246,6 +247,7 @@ public void testMetaMergeContentQuirk() throws Throwable { @Test @MediumTest @Feature({"AndroidWebView"}) + @DisabledTest(message = "https://crbug.com/1133535") public void testMetaMergeContentQuirkOverrides() throws Throwable { final TestAwContentsClient contentClient = new TestAwContentsClient(); final AwTestContainerView testContainerView = diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java index 10f1ede81d80e2..e7b9c79450bd59 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java @@ -2941,6 +2941,7 @@ public void testAppCacheWithTwoViews() throws Throwable { @Test @SmallTest @Feature({"AndroidWebView", "Preferences"}) + @DisabledTest(message = "https://crbug.com/1133535") public void testUseWideViewportWithTwoViews() throws Throwable { ViewPair views = createViews(true); runPerViewSettingsTest( @@ -2951,6 +2952,7 @@ public void testUseWideViewportWithTwoViews() throws Throwable { @Test @SmallTest @Feature({"AndroidWebView", "Preferences"}) + @DisabledTest(message = "https://crbug.com/1133535") public void testUseWideViewportWithTwoViewsNoQuirks() throws Throwable { ViewPair views = createViews(); runPerViewSettingsTest( @@ -3021,6 +3023,7 @@ private void useWideViewportLayoutWidthTest( @Test @SmallTest @Feature({"AndroidWebView", "Preferences"}) + @DisabledTest(message = "https://crbug.com/1133535") public void testUseWideViewportLayoutWidth() throws Throwable { TestAwContentsClient contentClient = new TestAwContentsClient(); AwTestContainerView testContainerView = @@ -3031,6 +3034,7 @@ public void testUseWideViewportLayoutWidth() throws Throwable { @Test @SmallTest @Feature({"AndroidWebView", "Preferences"}) + @DisabledTest(message = "https://crbug.com/1133535") public void testUseWideViewportLayoutWidthNoQuirks() throws Throwable { TestAwContentsClient contentClient = new TestAwContentsClient(); AwTestContainerView testContainerView =