diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-05 01:05:10 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-05 01:05:10 +0000 |
| commit | c98158de513ef1e83dd6cb09c43c7fb7e8e42965 (patch) | |
| tree | 7ae12ae546b6ba2bd5ecb3298a1c6f0dc2059a66 /net/socket | |
| parent | d08140cd489201e53c3de19a1983c872a02705a3 (diff) | |
| download | chromium_src-c98158de513ef1e83dd6cb09c43c7fb7e8e42965.zip chromium_src-c98158de513ef1e83dd6cb09c43c7fb7e8e42965.tar.gz chromium_src-c98158de513ef1e83dd6cb09c43c7fb7e8e42965.tar.bz2 | |
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
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/transport_client_socket_pool_unittest.cc | 9 |
1 files changed, 4 insertions, 5 deletions
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[] = { |