summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorpshenoy@chromium.org <pshenoy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-07 07:53:12 +0000
committerpshenoy@chromium.org <pshenoy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-07 07:53:12 +0000
commit2c25b221d74afa62828d6a9dc74c10e72177d343 (patch)
tree5e23303e33984f623280695bd118537f54063f13 /chrome/browser/extensions
parentda875fde48b4580fddba599ed1c60d8931f24a11 (diff)
downloadchromium_src-2c25b221d74afa62828d6a9dc74c10e72177d343.zip
chromium_src-2c25b221d74afa62828d6a9dc74c10e72177d343.tar.gz
chromium_src-2c25b221d74afa62828d6a9dc74c10e72177d343.tar.bz2
Disable ExternallyConnectableMessagingTest.WebConnectableWithEmptyTlsChannelIdAndClosedBackgroundPage on Linux official bot.
This test fails intermittently on official Linux bot with TIMED OUT error. See http://crbug.com/315264 for more details. BUG=315264 Review URL: https://codereview.chromium.org/61063002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_messages_apitest.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc
index b47e8ea..d089204 100644
--- a/chrome/browser/extensions/extension_messages_apitest.cc
+++ b/chrome/browser/extensions/extension_messages_apitest.cc
@@ -532,10 +532,18 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest,
EXPECT_EQ(std::string(), tls_channel_id);
}
+// Flaky on official Linux bot. http://crbug.com/315264
+#if defined(GOOGLE_CHROME_BUILD) && defined(OS_LINUX)
+#define MAYBE_WebConnectableWithEmptyTlsChannelIdAndClosedBackgroundPage \
+ DISABLED_WebConnectableWithEmptyTlsChannelIdAndClosedBackgroundPage
+#else
+#define MAYBE_WebConnectableWithEmptyTlsChannelIdAndClosedBackgroundPage \
+ WebConnectableWithEmptyTlsChannelIdAndClosedBackgroundPage
+#endif
// Tests a web connectable extension that receives TLS channel id, but
// immediately closes its background page upon receipt of a message.
IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest,
- WebConnectableWithEmptyTlsChannelIdAndClosedBackgroundPage) {
+ MAYBE_WebConnectableWithEmptyTlsChannelIdAndClosedBackgroundPage) {
InitializeTestServer();
const Extension* chromium_connectable =