From c98158de513ef1e83dd6cb09c43c7fb7e8e42965 Mon Sep 17 00:00:00 2001 From: "rtenneti@chromium.org" Date: Sat, 5 Nov 2011 01:05:10 +0000 Subject: Disabled BackupSocketFailAfterStall on all platforms. Will enable them after 99889 is fixed. BUG=89273 R=wtc TEST=network unittest Review URL: http://codereview.chromium.org/8478007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108757 0039d316-1c4b-4281-b951-d872f2087c98 --- net/socket/transport_client_socket_pool_unittest.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'net/socket') diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc index 0831285..bca6214 100644 --- a/net/socket/transport_client_socket_pool_unittest.cc +++ b/net/socket/transport_client_socket_pool_unittest.cc @@ -1001,14 +1001,13 @@ TEST_F(TransportClientSocketPoolTest, BackupSocketCancel) { // 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) +// Flaky timeout on win/linux/mac: http://crbug.com/89273 +// http://crbug.com/94501 and http://crbug.com/99889 +#if defined(DCHECK_ALWAYS_ON) // Disabled in release with dcheck : http://crbug.com/94501 #define MAYBE_BackupSocketFailAfterStall DISABLED_BackupSocketFailAfterStall #else -#define MAYBE_BackupSocketFailAfterStall BackupSocketFailAfterStall +#define MAYBE_BackupSocketFailAfterStall FLAKY_BackupSocketFailAfterStall #endif TEST_F(TransportClientSocketPoolTest, MAYBE_BackupSocketFailAfterStall) { MockClientSocketFactory::ClientSocketType case_types[] = { -- cgit v1.1