diff options
author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-21 22:17:47 +0000 |
---|---|---|
committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-21 22:17:47 +0000 |
commit | eb8605cc05a24c5d444c43d3c559b44ce7a5a75e (patch) | |
tree | eefc9b78a69d6e740b06cc408cfe0dd8e159bcc4 /net/socket/ssl_client_socket_unittest.cc | |
parent | b90490bbcbaad21ce539f1e7bd9dbfbfdeb164e1 (diff) | |
download | chromium_src-eb8605cc05a24c5d444c43d3c559b44ce7a5a75e.zip chromium_src-eb8605cc05a24c5d444c43d3c559b44ce7a5a75e.tar.gz chromium_src-eb8605cc05a24c5d444c43d3c559b44ce7a5a75e.tar.bz2 |
net-internals: Log the addresses that were attempted during a TCP connect, and any OS errors that attempts failed with (windows implementation)
Note that this change is the same as r47764, but for the windows implementation.
BUG=44488
Review URL: http://codereview.chromium.org/2127011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47956 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_unittest.cc')
-rw-r--r-- | net/socket/ssl_client_socket_unittest.cc | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc index 9a46c4a..415cb83 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc @@ -83,11 +83,8 @@ TEST_F(SSLClientSocketTest, Connect) { EXPECT_FALSE(sock->IsConnected()); rv = sock->Connect(&callback); - // TODO(eroman): re-enable this once the logging for - // TCPClientSocketLibevent is in sync with TCPClientSocketWin. - // http://crbug.com/44488 - // EXPECT_TRUE(net::LogContainsBeginEvent( - // log.entries(), 2, net::NetLog::TYPE_SSL_CONNECT)); + EXPECT_TRUE(net::LogContainsBeginEvent( + log.entries(), 4, net::NetLog::TYPE_SSL_CONNECT)); if (rv != net::OK) { ASSERT_EQ(net::ERR_IO_PENDING, rv); EXPECT_FALSE(sock->IsConnected()); @@ -130,11 +127,8 @@ TEST_F(SSLClientSocketTest, ConnectExpired) { EXPECT_FALSE(sock->IsConnected()); rv = sock->Connect(&callback); - // TODO(eroman): re-enable this once the logging for - // TCPClientSocketLibevent is in sync with TCPClientSocketWin. - // http://crbug.com/44488 - // EXPECT_TRUE(net::LogContainsBeginEvent( - // log.entries(), 2, net::NetLog::TYPE_SSL_CONNECT)); + EXPECT_TRUE(net::LogContainsBeginEvent( + log.entries(), 4, net::NetLog::TYPE_SSL_CONNECT)); if (rv != net::OK) { ASSERT_EQ(net::ERR_IO_PENDING, rv); EXPECT_FALSE(sock->IsConnected()); @@ -179,11 +173,8 @@ TEST_F(SSLClientSocketTest, ConnectMismatched) { rv = sock->Connect(&callback); - // TODO(eroman): re-enable this once the logging for - // TCPClientSocketLibevent is in sync with TCPClientSocketWin. - // http://crbug.com/44488 - // EXPECT_TRUE(net::LogContainsBeginEvent( - // log.entries(), 2, net::NetLog::TYPE_SSL_CONNECT)); + EXPECT_TRUE(net::LogContainsBeginEvent( + log.entries(), 4, net::NetLog::TYPE_SSL_CONNECT)); if (rv != net::ERR_CERT_COMMON_NAME_INVALID) { ASSERT_EQ(net::ERR_IO_PENDING, rv); EXPECT_FALSE(sock->IsConnected()); |