diff options
| author | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 23:56:40 +0000 |
|---|---|---|
| committer | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 23:56:40 +0000 |
| commit | 406a1df858fc7424213b2659272f1f2ae66f8bcd (patch) | |
| tree | 77e2308dbe6cea38974cd3afce4a1ca73e78e681 /net | |
| parent | 71b6d57d0fce39feaa91f007af1a3d731dab245c (diff) | |
| download | chromium_src-406a1df858fc7424213b2659272f1f2ae66f8bcd.zip chromium_src-406a1df858fc7424213b2659272f1f2ae66f8bcd.tar.gz chromium_src-406a1df858fc7424213b2659272f1f2ae66f8bcd.tar.bz2 | |
Re-enable tests after MockHostResolver change
BUG=89273,94501,99889
TEST=./net_unittests
Review URL: http://codereview.chromium.org/8503019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109131 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/socket/transport_client_socket_pool_unittest.cc | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc index bca6214..236adcd 100644 --- a/net/socket/transport_client_socket_pool_unittest.cc +++ b/net/socket/transport_client_socket_pool_unittest.cc @@ -797,13 +797,7 @@ class RequestSocketCallback : public CallbackRunner< Tuple1<int> > { TestOldCompletionCallback callback_; }; -// Disabled in release with dcheck : http://crbug.com/94501 -#if defined(DCHECK_ALWAYS_ON) -#define MAYBE_RequestTwice DISABLED_RequestTwice -#else -#define MAYBE_RequestTwice RequestTwice -#endif -TEST_F(TransportClientSocketPoolTest, MAYBE_RequestTwice) { +TEST_F(TransportClientSocketPoolTest, RequestTwice) { ClientSocketHandle handle; RequestSocketCallback callback(&handle, &pool_); scoped_refptr<TransportSocketParams> dest(new TransportSocketParams( @@ -999,17 +993,7 @@ TEST_F(TransportClientSocketPoolTest, BackupSocketCancel) { // Test the case where a socket took long enough to start the creation // of the backup socket and never completes, and then the backup // connection fails. -// - -// 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 FLAKY_BackupSocketFailAfterStall -#endif -TEST_F(TransportClientSocketPoolTest, MAYBE_BackupSocketFailAfterStall) { +TEST_F(TransportClientSocketPoolTest, BackupSocketFailAfterStall) { MockClientSocketFactory::ClientSocketType case_types[] = { // The first socket will not connect. MockClientSocketFactory::MOCK_STALLED_CLIENT_SOCKET, @@ -1054,13 +1038,7 @@ TEST_F(TransportClientSocketPoolTest, MAYBE_BackupSocketFailAfterStall) { // Test the case where a socket took long enough to start the creation // of the backup socket and eventually completes, but the backup socket // fails. -// Disabled in release with dcheck : http://crbug.com/94501 -#if defined(DCHECK_ALWAYS_ON) -#define MAYBE_BackupSocketFailAfterDelay DISABLED_BackupSocketFailAfterDelay -#else -#define MAYBE_BackupSocketFailAfterDelay BackupSocketFailAfterDelay -#endif -TEST_F(TransportClientSocketPoolTest, MAYBE_BackupSocketFailAfterDelay) { +TEST_F(TransportClientSocketPoolTest, BackupSocketFailAfterDelay) { MockClientSocketFactory::ClientSocketType case_types[] = { // The first socket will connect, although delayed. MockClientSocketFactory::MOCK_DELAYED_CLIENT_SOCKET, |