Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1324)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/ssl_client_socket_unittest.cc

Issue 12210088: Make the TestServer use an absolute document root path. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: testserver uses absolute docroot path Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/proxy/proxy_script_fetcher_impl_unittest.cc ('k') | net/test/base_test_server.h » ('j') | net/test/base_test_server.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_unittest.cc
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index 89356bfad20c6117f770fc8be132e70c36146e98..3cb828fe7ca95ae7c467bbbfccab37e19ee43e3c 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -74,7 +74,7 @@ static bool LogContainsSSLConnectEndEvent(
TEST_F(SSLClientSocketTest, Connect) {
net::TestServer test_server(net::TestServer::TYPE_HTTPS,
net::TestServer::kLocalhost,
- base::FilePath());
+ net::TestServer::GetSourcePath());
ASSERT_TRUE(test_server.Start());
net::AddressList addr;
@@ -117,7 +117,7 @@ TEST_F(SSLClientSocketTest, ConnectExpired) {
net::TestServer::SSLOptions::CERT_EXPIRED);
net::TestServer test_server(net::TestServer::TYPE_HTTPS,
ssl_options,
- base::FilePath());
+ net::TestServer::GetSourcePath());
ASSERT_TRUE(test_server.Start());
cert_verifier_->set_default_result(net::ERR_CERT_DATE_INVALID);
@@ -164,7 +164,7 @@ TEST_F(SSLClientSocketTest, ConnectMismatched) {
net::TestServer::SSLOptions::CERT_MISMATCHED_NAME);
net::TestServer test_server(net::TestServer::TYPE_HTTPS,
ssl_options,
- base::FilePath());
+ net::TestServer::GetSourcePath());
ASSERT_TRUE(test_server.Start());
cert_verifier_->set_default_result(net::ERR_CERT_COMMON_NAME_INVALID);
@@ -213,7 +213,7 @@ TEST_F(SSLClientSocketTest, ConnectClientAuthCertRequested) {
ssl_options.request_client_certificate = true;
net::TestServer test_server(net::TestServer::TYPE_HTTPS,
ssl_options,
- base::FilePath());
+ net::TestServer::GetSourcePath());
ASSERT_TRUE(test_server.Start());
net::AddressList addr;
@@ -275,7 +275,7 @@ TEST_F(SSLClientSocketTest, ConnectClientAuthSendNullCert) {
ssl_options.request_client_certificate = true;
net::TestServer test_server(net::TestServer::TYPE_HTTPS,
ssl_options,
- base::FilePath());
+ net::TestServer::GetSourcePath());
ASSERT_TRUE(test_server.Start());
net::AddressList addr;
@@ -335,7 +335,7 @@ TEST_F(SSLClientSocketTest, ConnectClientAuthSendNullCert) {
TEST_F(SSLClientSocketTest, Read) {
net::TestServer test_server(net::TestServer::TYPE_HTTPS,
net::TestServer::kLocalhost,
- base::FilePath());
+ net::TestServer::GetSourcePath());
ASSERT_TRUE(test_server.Start());
net::AddressList addr;
@@ -391,7 +391,7 @@ TEST_F(SSLClientSocketTest, Read) {
TEST_F(SSLClientSocketTest, Read_FullDuplex) {
net::TestServer test_server(net::TestServer::TYPE_HTTPS,
net::TestServer::kLocalhost,
- base::FilePath());
+ net::TestServer::GetSourcePath());
ASSERT_TRUE(test_server.Start());
net::AddressList addr;
@@ -449,7 +449,7 @@ TEST_F(SSLClientSocketTest, Read_FullDuplex) {
TEST_F(SSLClientSocketTest, Read_SmallChunks) {
net::TestServer test_server(net::TestServer::TYPE_HTTPS,
net::TestServer::kLocalhost,
- base::FilePath());
+ net::TestServer::GetSourcePath());
ASSERT_TRUE(test_server.Start());
net::AddressList addr;
@@ -502,7 +502,7 @@ TEST_F(SSLClientSocketTest, Read_SmallChunks) {
TEST_F(SSLClientSocketTest, Read_Interrupted) {
net::TestServer test_server(net::TestServer::TYPE_HTTPS,
net::TestServer::kLocalhost,
- base::FilePath());
+ net::TestServer::GetSourcePath());
ASSERT_TRUE(test_server.Start());
net::AddressList addr;
@@ -552,7 +552,7 @@ TEST_F(SSLClientSocketTest, Read_Interrupted) {
TEST_F(SSLClientSocketTest, Read_FullLogging) {
net::TestServer test_server(net::TestServer::TYPE_HTTPS,
net::TestServer::kLocalhost,
- base::FilePath());
+ net::TestServer::GetSourcePath());
ASSERT_TRUE(test_server.Start());
net::AddressList addr;
@@ -620,7 +620,7 @@ TEST_F(SSLClientSocketTest, Read_FullLogging) {
TEST_F(SSLClientSocketTest, PrematureApplicationData) {
net::TestServer test_server(net::TestServer::TYPE_HTTPS,
net::TestServer::kLocalhost,
- base::FilePath());
+ net::TestServer::GetSourcePath());
ASSERT_TRUE(test_server.Start());
net::AddressList addr;
@@ -684,7 +684,7 @@ TEST_F(SSLClientSocketTest, CipherSuiteDisables) {
net::TestServer::SSLOptions::BULK_CIPHER_RC4;
net::TestServer test_server(net::TestServer::TYPE_HTTPS,
ssl_options,
- base::FilePath());
+ net::TestServer::GetSourcePath());
ASSERT_TRUE(test_server.Start());
net::AddressList addr;
@@ -755,7 +755,7 @@ TEST_F(SSLClientSocketTest, CipherSuiteDisables) {
TEST_F(SSLClientSocketTest, ClientSocketHandleNotFromPool) {
net::TestServer test_server(net::TestServer::TYPE_HTTPS,
net::TestServer::kLocalhost,
- base::FilePath());
+ net::TestServer::GetSourcePath());
ASSERT_TRUE(test_server.Start());
net::AddressList addr;
@@ -789,7 +789,7 @@ TEST_F(SSLClientSocketTest, ClientSocketHandleNotFromPool) {
TEST_F(SSLClientSocketTest, ExportKeyingMaterial) {
net::TestServer test_server(net::TestServer::TYPE_HTTPS,
net::TestServer::kLocalhost,
- base::FilePath());
+ net::TestServer::GetSourcePath());
ASSERT_TRUE(test_server.Start());
net::AddressList addr;
@@ -886,7 +886,8 @@ TEST_F(SSLClientSocketTest, VerifyReturnChainProperlyOrdered) {
net::TestServer::SSLOptions::CERT_CHAIN_WRONG_ROOT);
net::TestServer test_server(
net::TestServer::TYPE_HTTPS, ssl_options,
- base::FilePath(FILE_PATH_LITERAL("net/data/ssl")));
+ net::TestServer::GetSourceRelativePath(
+ base::FilePath(FILE_PATH_LITERAL("net/data/ssl"))));
ASSERT_TRUE(test_server.Start());
net::AddressList addr;
@@ -947,7 +948,7 @@ class SSLClientSocketCertRequestInfoTest : public SSLClientSocketTest {
net::TestServer::SSLOptions ssl_options) {
net::TestServer test_server(net::TestServer::TYPE_HTTPS,
ssl_options,
- base::FilePath());
+ net::TestServer::GetSourcePath());
if (!test_server.Start())
return NULL;
« no previous file with comments | « net/proxy/proxy_script_fetcher_impl_unittest.cc ('k') | net/test/base_test_server.h » ('j') | net/test/base_test_server.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698