diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 18:00:02 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 18:00:02 +0000 |
| commit | fc21277e73baabd1fb1fd02cc1d3cf228aa8512a (patch) | |
| tree | 18549e02ef7d938c85c8074ecf81578733ccf748 /net/socket/ssl_client_socket_unittest.cc | |
| parent | 2aa021282aa83a7493bc72677ffe83a8e5183892 (diff) | |
| download | chromium_src-fc21277e73baabd1fb1fd02cc1d3cf228aa8512a.zip chromium_src-fc21277e73baabd1fb1fd02cc1d3cf228aa8512a.tar.gz chromium_src-fc21277e73baabd1fb1fd02cc1d3cf228aa8512a.tar.bz2 | |
Revert 56384 - Don't resolve IP literals.
For each resolution request this checks to see if this 'host' is a literal ip address. If so, it synthesises a struct addrinfo and returns it without adding it to the cache.
BUG=39830
TEST=unit tests, new and old
Review URL: http://codereview.chromium.org/3023048
TBR=vandebo@chromium.org
Review URL: http://codereview.chromium.org/3115014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56385 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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc index 1131c0c..c242db1 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc @@ -257,6 +257,9 @@ TEST_F(SSLClientSocketTest, Read) { net::HostResolver::RequestInfo info(server_.kHostName, server_.kOKHTTPSPort); int rv = resolver_->Resolve(info, &addr, &callback, NULL, net::BoundNetLog()); + EXPECT_EQ(net::ERR_IO_PENDING, rv); + + rv = callback.WaitForResult(); EXPECT_EQ(net::OK, rv); net::ClientSocket* transport = new net::TCPClientSocket(addr, NULL); @@ -316,6 +319,9 @@ TEST_F(SSLClientSocketTest, Read_FullDuplex) { net::HostResolver::RequestInfo info(server_.kHostName, server_.kOKHTTPSPort); int rv = resolver_->Resolve(info, &addr, &callback, NULL, net::BoundNetLog()); + EXPECT_EQ(net::ERR_IO_PENDING, rv); + + rv = callback.WaitForResult(); EXPECT_EQ(net::OK, rv); net::ClientSocket* transport = new net::TCPClientSocket(addr, NULL); |