diff options
Diffstat (limited to 'net/socket/socks_client_socket_pool_unittest.cc')
| -rw-r--r-- | net/socket/socks_client_socket_pool_unittest.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/net/socket/socks_client_socket_pool_unittest.cc b/net/socket/socks_client_socket_pool_unittest.cc index fb83d96..7bfce55 100644 --- a/net/socket/socks_client_socket_pool_unittest.cc +++ b/net/socket/socks_client_socket_pool_unittest.cc @@ -319,15 +319,16 @@ TEST_F(SOCKSClientSocketPoolTest, CancelDuringTCPConnect) { pool_->CancelRequest("a", requests_[0]->handle()); pool_->CancelRequest("a", requests_[1]->handle()); - EXPECT_EQ(1, tcp_socket_pool_->cancel_count()); + // Requests in the connect phase don't actually get cancelled. + EXPECT_EQ(0, tcp_socket_pool_->cancel_count()); // Now wait for the TCP sockets to connect. MessageLoop::current()->RunAllPending(); EXPECT_EQ(kRequestNotFound, GetOrderOfRequest(1)); EXPECT_EQ(kRequestNotFound, GetOrderOfRequest(2)); - EXPECT_EQ(1, tcp_socket_pool_->cancel_count()); - EXPECT_EQ(1, pool_->IdleSocketCount()); + EXPECT_EQ(0, tcp_socket_pool_->cancel_count()); + EXPECT_EQ(2, pool_->IdleSocketCount()); requests_[0]->handle()->Reset(); requests_[1]->handle()->Reset(); @@ -354,7 +355,8 @@ TEST_F(SOCKSClientSocketPoolTest, CancelDuringSOCKSConnect) { pool_->CancelRequest("a", requests_[0]->handle()); pool_->CancelRequest("a", requests_[1]->handle()); EXPECT_EQ(0, tcp_socket_pool_->cancel_count()); - EXPECT_EQ(1, tcp_socket_pool_->release_count()); + // Requests in the connect phase don't actually get cancelled. + EXPECT_EQ(0, tcp_socket_pool_->release_count()); // Now wait for the async data to reach the SOCKS connect jobs. MessageLoop::current()->RunAllPending(); @@ -362,8 +364,8 @@ TEST_F(SOCKSClientSocketPoolTest, CancelDuringSOCKSConnect) { EXPECT_EQ(kRequestNotFound, GetOrderOfRequest(1)); EXPECT_EQ(kRequestNotFound, GetOrderOfRequest(2)); EXPECT_EQ(0, tcp_socket_pool_->cancel_count()); - EXPECT_EQ(1, tcp_socket_pool_->release_count()); - EXPECT_EQ(1, pool_->IdleSocketCount()); + EXPECT_EQ(0, tcp_socket_pool_->release_count()); + EXPECT_EQ(2, pool_->IdleSocketCount()); requests_[0]->handle()->Reset(); requests_[1]->handle()->Reset(); |