summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymes Khoury <raymes@chromium.org>2014-11-10 10:55:57 +1100
committerRaymes Khoury <raymes@chromium.org>2014-11-09 23:57:14 +0000
commite42d0d199989109375bdcec46f776fe53b4ed000 (patch)
tree5ea42c5a7df9f82561f8d6837c997c4c552ad509
parent1694addd2c0b173a6a95ce675b7c38a268eddba4 (diff)
downloadchromium_src-e42d0d199989109375bdcec46f776fe53b4ed000.zip
chromium_src-e42d0d199989109375bdcec46f776fe53b4ed000.tar.gz
chromium_src-e42d0d199989109375bdcec46f776fe53b4ed000.tar.bz2
Disable WebViewTest.ShimSrcAttribute
WebViewTest.ShimSrcAttribute is flaky. TBR=fsamuel@chromium.org BUG=431604 Review URL: https://codereview.chromium.org/704193003 Cr-Commit-Position: refs/heads/master@{#303409}
-rw-r--r--chrome/browser/apps/web_view_browsertest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/apps/web_view_browsertest.cc b/chrome/browser/apps/web_view_browsertest.cc
index 4f61be5..3bd8395 100644
--- a/chrome/browser/apps/web_view_browsertest.cc
+++ b/chrome/browser/apps/web_view_browsertest.cc
@@ -1254,7 +1254,13 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, InterstitialTeardown) {
window->GetBaseWindow()->Close();
}
-IN_PROC_BROWSER_TEST_F(WebViewTest, ShimSrcAttribute) {
+#if defined(OS_LINUX)
+// http://crbug.com/431604
+#define MAYBE_ShimSrcAttribute DISABLED_ShimSrcAttribute
+#else
+#define MAYBE_ShimSrcAttribute ShimSrcAttribute
+#endif
+IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_ShimSrcAttribute) {
ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/src_attribute"))
<< message_;
}