summaryrefslogtreecommitdiffstats
path: root/net/socket
diff options
context:
space:
mode:
authorerikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-24 16:16:20 +0000
committererikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-24 16:16:20 +0000
commitd9fca99ac07676b78cc679b462f4adbeba7c0976 (patch)
tree31e6fd898a6c1766046b180b04d628fffa287ff6 /net/socket
parented37a0944c1d576ff088e1f9f511f6029e79417c (diff)
downloadchromium_src-d9fca99ac07676b78cc679b462f4adbeba7c0976.zip
chromium_src-d9fca99ac07676b78cc679b462f4adbeba7c0976.tar.gz
chromium_src-d9fca99ac07676b78cc679b462f4adbeba7c0976.tar.bz2
Remove usage of a deprecated TestServer constructor.
Hostname must now be explicitly specified (previously default was 127.0.0.1). See the following CL for further details: http://codereview.chromium.org/9369029/ A follow-up CL will remove the deprecated constructor: http://codereview.chromium.org/9431002/ BUG=114369 TEST=everything still compiles and passes Review URL: http://codereview.chromium.org/9430050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123486 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
-rw-r--r--net/socket/ssl_client_socket_unittest.cc32
1 files changed, 24 insertions, 8 deletions
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index e43d83e..bf156d1 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -67,7 +67,9 @@ static bool LogContainsSSLConnectEndEvent(
};
TEST_F(SSLClientSocketTest, Connect) {
- net::TestServer test_server(net::TestServer::TYPE_HTTPS, FilePath());
+ net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+ net::TestServer::kLocalhost,
+ FilePath());
ASSERT_TRUE(test_server.Start());
net::AddressList addr;
@@ -317,7 +319,9 @@ TEST_F(SSLClientSocketTest, ConnectClientAuthSendNullCert) {
// - Server sends data unexpectedly.
TEST_F(SSLClientSocketTest, Read) {
- net::TestServer test_server(net::TestServer::TYPE_HTTPS, FilePath());
+ net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+ net::TestServer::kLocalhost,
+ FilePath());
ASSERT_TRUE(test_server.Start());
net::AddressList addr;
@@ -371,7 +375,9 @@ TEST_F(SSLClientSocketTest, Read) {
// Test the full duplex mode, with Read and Write pending at the same time.
// This test also serves as a regression test for http://crbug.com/29815.
TEST_F(SSLClientSocketTest, Read_FullDuplex) {
- net::TestServer test_server(net::TestServer::TYPE_HTTPS, FilePath());
+ net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+ net::TestServer::kLocalhost,
+ FilePath());
ASSERT_TRUE(test_server.Start());
net::AddressList addr;
@@ -430,7 +436,9 @@ TEST_F(SSLClientSocketTest, Read_FullDuplex) {
}
TEST_F(SSLClientSocketTest, Read_SmallChunks) {
- net::TestServer test_server(net::TestServer::TYPE_HTTPS, FilePath());
+ net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+ net::TestServer::kLocalhost,
+ FilePath());
ASSERT_TRUE(test_server.Start());
net::AddressList addr;
@@ -481,7 +489,9 @@ TEST_F(SSLClientSocketTest, Read_SmallChunks) {
}
TEST_F(SSLClientSocketTest, Read_Interrupted) {
- net::TestServer test_server(net::TestServer::TYPE_HTTPS, FilePath());
+ net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+ net::TestServer::kLocalhost,
+ FilePath());
ASSERT_TRUE(test_server.Start());
net::AddressList addr;
@@ -529,7 +539,9 @@ TEST_F(SSLClientSocketTest, Read_Interrupted) {
}
TEST_F(SSLClientSocketTest, Read_FullLogging) {
- net::TestServer test_server(net::TestServer::TYPE_HTTPS, FilePath());
+ net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+ net::TestServer::kLocalhost,
+ FilePath());
ASSERT_TRUE(test_server.Start());
net::AddressList addr;
@@ -595,7 +607,9 @@ TEST_F(SSLClientSocketTest, Read_FullLogging) {
// Regression test for http://crbug.com/42538
TEST_F(SSLClientSocketTest, PrematureApplicationData) {
- net::TestServer test_server(net::TestServer::TYPE_HTTPS, FilePath());
+ net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+ net::TestServer::kLocalhost,
+ FilePath());
ASSERT_TRUE(test_server.Start());
net::AddressList addr;
@@ -724,7 +738,9 @@ TEST_F(SSLClientSocketTest, CipherSuiteDisables) {
// Here we verify that such a simple ClientSocketHandle, not associated with any
// client socket pool, can be destroyed safely.
TEST_F(SSLClientSocketTest, ClientSocketHandleNotFromPool) {
- net::TestServer test_server(net::TestServer::TYPE_HTTPS, FilePath());
+ net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+ net::TestServer::kLocalhost,
+ FilePath());
ASSERT_TRUE(test_server.Start());
net::AddressList addr;