summaryrefslogtreecommitdiffstats
path: root/android_webview/javatests
diff options
context:
space:
mode:
authormkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-21 15:14:13 +0000
committermkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-21 15:14:13 +0000
commit269ba3428afe7cd2dfcf95f48e12f6b3b8402cec (patch)
treeb555eacbfb6e9b418fe0e79c7c284d5492918b27 /android_webview/javatests
parent1d768463ddc4ad0c32277bccd214ac0eab7709fa (diff)
downloadchromium_src-269ba3428afe7cd2dfcf95f48e12f6b3b8402cec.zip
chromium_src-269ba3428afe7cd2dfcf95f48e12f6b3b8402cec.tar.gz
chromium_src-269ba3428afe7cd2dfcf95f48e12f6b3b8402cec.tar.bz2
[android_webview] Disable AwSettingsTest broken by Blink roll.
The Blink roll mentioned in the attached bug fixes the downstream build but also breaks this test. Disabling the test as a working build is more important. BUG=242526 R=mnaganov@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/15288010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201308 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/javatests')
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java6
1 files changed, 5 insertions, 1 deletions
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 22da117..fa5e015 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
@@ -1983,8 +1983,12 @@ public class AwSettingsTest extends AwTestBase {
assertEquals(expectedTitle, getTitleOnUiThread(awContents));
}
+ /**
@SmallTest
- @Feature({"AndroidWebView", "Preferences"})
+ @Feature({"AndroidWebView", "Preferences"}
+ http://crbug.com/242526
+ */
+ @DisabledTest
public void testLayoutAlgorithmWithTwoViews() throws Throwable {
ViewPair views = createViews();
runPerViewSettingsTest(