summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authormpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-01 00:27:17 +0000
committermpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-01 00:27:17 +0000
commitfa67fada488b4c9a4d477ac52cd6660c8d984efe (patch)
treead4c9f3341c9d654215e2aa0128317ae26d3cafc /android_webview
parent5441e03a5dc4747e8ac89b0c78a03c8e85bbf7e1 (diff)
downloadchromium_src-fa67fada488b4c9a4d477ac52cd6660c8d984efe.zip
chromium_src-fa67fada488b4c9a4d477ac52cd6660c8d984efe.tar.gz
chromium_src-fa67fada488b4c9a4d477ac52cd6660c8d984efe.tar.bz2
Disable flaky Android test testReceivingSizeAfterLoadUpdatesLayout.
BUG=348159 R=boliu@chromium.org Review URL: https://codereview.chromium.org/183693008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254291 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
index 5370317..5b73156 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
@@ -13,6 +13,7 @@ import org.chromium.android_webview.AwContents;
import org.chromium.android_webview.AwContentsClient;
import org.chromium.android_webview.AwLayoutSizer;
import org.chromium.android_webview.test.util.CommonResources;
+import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.Feature;
import org.chromium.content.browser.test.util.CallbackHelper;
import org.chromium.ui.gfx.DeviceDisplayInfo;
@@ -356,8 +357,9 @@ public class AndroidViewIntegrationTest extends AwTestBase {
assertEquals(expectedHeightCss, mOnContentSizeChangedHelper.getHeight());
}
- @SmallTest
- @Feature({"AndroidWebView"})
+ //@SmallTest
+ //@Feature({"AndroidWebView"})
+ @DisabledTest
public void testReceivingSizeAfterLoadUpdatesLayout() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
final AwTestContainerView testContainerView = createDetachedTestContainerViewOnMainSync(