summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-28 01:57:46 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-28 01:57:46 +0000
commit458b7b1867b8255b7ed09ca1bfa16f420fcd20ff (patch)
tree1e8f7644fea06a915089072b3137fbc392596812 /net
parentbbf024eeb695f3d05393da6777349010dbd30cfb (diff)
downloadchromium_src-458b7b1867b8255b7ed09ca1bfa16f420fcd20ff.zip
chromium_src-458b7b1867b8255b7ed09ca1bfa16f420fcd20ff.tar.gz
chromium_src-458b7b1867b8255b7ed09ca1bfa16f420fcd20ff.tar.bz2
Mark TransportClientSocketPoolTest.BackupSocketFailAfterStall as flaky on linux/mac, since it is sporadically timing out at 24 seconds.
BUG=89273 Review URL: http://codereview.chromium.org/8400051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/socket/transport_client_socket_pool_unittest.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc
index 5e39a89..0831285 100644
--- a/net/socket/transport_client_socket_pool_unittest.cc
+++ b/net/socket/transport_client_socket_pool_unittest.cc
@@ -1000,8 +1000,12 @@ TEST_F(TransportClientSocketPoolTest, BackupSocketCancel) {
// of the backup socket and never completes, and then the backup
// connection fails.
//
+
+// Flaky timeout on linux/mac: http://crbug.com/89273
+#if defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_LINUX)
+#define MAYBE_BackupSocketFailAfterStall FLAKY_BackupSocketFailAfterStall
+#elif defined(DCHECK_ALWAYS_ON)
// Disabled in release with dcheck : http://crbug.com/94501
-#if defined(DCHECK_ALWAYS_ON)
#define MAYBE_BackupSocketFailAfterStall DISABLED_BackupSocketFailAfterStall
#else
#define MAYBE_BackupSocketFailAfterStall BackupSocketFailAfterStall