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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/url_request/url_request_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
« net/test/remote_test_server.h ('K') | « net/url_request/url_request_context_builder_unittest.cc ('k') | sync/internal_api/http_bridge_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_request_unittest.cc
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 4f223e5c8333c3471de00b90643961173537cf1f..b951e3f3ae7ae3646ecf05b6308f4a55ea6ed619 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -1414,11 +1414,11 @@ class LocalHttpTestServer : public TestServer {
explicit LocalHttpTestServer(const base::FilePath& document_root)
: TestServer(TestServer::TYPE_HTTP,
ScopedCustomUrlRequestTestHttpHost::value(),
- document_root) {}
+ GetSourceRelativePath(document_root)) {}
LocalHttpTestServer()
: TestServer(TestServer::TYPE_HTTP,
ScopedCustomUrlRequestTestHttpHost::value(),
- base::FilePath()) {}
+ GetSourcePath()) {}
};
TEST_F(URLRequestTest, DelayedCookieCallback) {
@@ -2949,7 +2949,8 @@ TEST_F(URLRequestTestHTTP, DISABLED_HTTPSToHTTPRedirectNoRefererTest) {
TestServer https_test_server(
TestServer::TYPE_HTTPS, TestServer::kLocalhost,
- base::FilePath(FILE_PATH_LITERAL("net/data/ssl")));
+ TestServer::GetSourceRelativePath(
+ base::FilePath(FILE_PATH_LITERAL("net/data/ssl"))));
ASSERT_TRUE(https_test_server.Start());
// An https server is sent a request with an https referer,
@@ -3393,7 +3394,8 @@ TEST_F(URLRequestTestHTTP, ProcessSTS) {
TestServer https_test_server(
TestServer::TYPE_HTTPS,
ssl_options,
- base::FilePath(FILE_PATH_LITERAL("net/data/url_request_unittest")));
+ TestServer::GetSourceRelativePath(
+ base::FilePath(FILE_PATH_LITERAL("net/data/url_request_unittest"))));
ASSERT_TRUE(https_test_server.Start());
TestDelegate d;
@@ -3420,7 +3422,8 @@ TEST_F(URLRequestTestHTTP, ProcessSTSOnce) {
TestServer https_test_server(
TestServer::TYPE_HTTPS,
ssl_options,
- base::FilePath(FILE_PATH_LITERAL("net/data/url_request_unittest")));
+ TestServer::GetSourceRelativePath(
+ base::FilePath(FILE_PATH_LITERAL("net/data/url_request_unittest"))));
ASSERT_TRUE(https_test_server.Start());
TestDelegate d;
@@ -4146,7 +4149,8 @@ class HTTPSRequestTest : public testing::Test {
TEST_F(HTTPSRequestTest, DISABLED_HTTPSGetTest) {
TestServer test_server(TestServer::TYPE_HTTPS,
TestServer::kLocalhost,
- base::FilePath(FILE_PATH_LITERAL("net/data/ssl")));
+ TestServer::GetSourceRelativePath(base::FilePath(
+ FILE_PATH_LITERAL("net/data/ssl"))));
ASSERT_TRUE(test_server.Start());
TestDelegate d;
@@ -4173,7 +4177,8 @@ TEST_F(HTTPSRequestTest, HTTPSMismatchedTest) {
TestServer::SSLOptions::CERT_MISMATCHED_NAME);
TestServer test_server(TestServer::TYPE_HTTPS,
ssl_options,
- base::FilePath(FILE_PATH_LITERAL("net/data/ssl")));
+ TestServer::GetSourceRelativePath(base::FilePath(
+ FILE_PATH_LITERAL("net/data/ssl"))));
ASSERT_TRUE(test_server.Start());
bool err_allowed = true;
@@ -4206,7 +4211,8 @@ TEST_F(HTTPSRequestTest, HTTPSExpiredTest) {
TestServer::SSLOptions::CERT_EXPIRED);
TestServer test_server(TestServer::TYPE_HTTPS,
ssl_options,
- base::FilePath(FILE_PATH_LITERAL("net/data/ssl")));
+ TestServer::GetSourceRelativePath(base::FilePath(
+ FILE_PATH_LITERAL("net/data/ssl"))));
ASSERT_TRUE(test_server.Start());
// Iterate from false to true, just so that we do the opposite of the
@@ -4253,7 +4259,8 @@ TEST_F(HTTPSRequestTest, TLSv1Fallback) {
TestServer::SSLOptions::TLS_INTOLERANT_TLS1_1;
TestServer test_server(TestServer::TYPE_HTTPS,
ssl_options,
- base::FilePath(FILE_PATH_LITERAL("net/data/ssl")));
+ TestServer::GetSourceRelativePath(base::FilePath(
+ FILE_PATH_LITERAL("net/data/ssl"))));
ASSERT_TRUE(test_server.Start());
TestDelegate d;
@@ -4280,7 +4287,8 @@ TEST_F(HTTPSRequestTest, HTTPSPreloadedHSTSTest) {
TestServer::SSLOptions::CERT_MISMATCHED_NAME);
TestServer test_server(TestServer::TYPE_HTTPS,
ssl_options,
- base::FilePath(FILE_PATH_LITERAL("net/data/ssl")));
+ TestServer::GetSourceRelativePath(base::FilePath(
+ FILE_PATH_LITERAL("net/data/ssl"))));
ASSERT_TRUE(test_server.Start());
// We require that the URL be www.google.com in order to pick up the
@@ -4323,7 +4331,8 @@ TEST_F(HTTPSRequestTest, HTTPSErrorsNoClobberTSSTest) {
TestServer::SSLOptions::CERT_MISMATCHED_NAME);
TestServer test_server(TestServer::TYPE_HTTPS,
ssl_options,
- base::FilePath(FILE_PATH_LITERAL("net/data/ssl")));
+ TestServer::GetSourceRelativePath(base::FilePath(
+ FILE_PATH_LITERAL("net/data/ssl"))));
ASSERT_TRUE(test_server.Start());
// We require that the URL be www.google.com in order to pick up the
@@ -4382,7 +4391,8 @@ TEST_F(HTTPSRequestTest, HSTSPreservesPosts) {
TestServer::SSLOptions ssl_options(TestServer::SSLOptions::CERT_OK);
TestServer test_server(TestServer::TYPE_HTTPS,
ssl_options,
- base::FilePath(FILE_PATH_LITERAL("net/data/ssl")));
+ TestServer::GetSourceRelativePath(base::FilePath(
+ FILE_PATH_LITERAL("net/data/ssl"))));
ASSERT_TRUE(test_server.Start());
@@ -4432,7 +4442,8 @@ TEST_F(HTTPSRequestTest, SSLv3Fallback) {
ssl_options.tls_intolerant = TestServer::SSLOptions::TLS_INTOLERANT_ALL;
TestServer test_server(TestServer::TYPE_HTTPS,
ssl_options,
- base::FilePath(FILE_PATH_LITERAL("net/data/ssl")));
+ TestServer::GetSourceRelativePath(base::FilePath(
+ FILE_PATH_LITERAL("net/data/ssl"))));
ASSERT_TRUE(test_server.Start());
TestDelegate d;
@@ -4482,7 +4493,8 @@ TEST_F(HTTPSRequestTest, ClientAuthTest) {
ssl_options.request_client_certificate = true;
TestServer test_server(TestServer::TYPE_HTTPS,
ssl_options,
- base::FilePath(FILE_PATH_LITERAL("net/data/ssl")));
+ TestServer::GetSourceRelativePath(base::FilePath(
+ FILE_PATH_LITERAL("net/data/ssl"))));
ASSERT_TRUE(test_server.Start());
SSLClientAuthTestDelegate d;
@@ -4518,7 +4530,8 @@ TEST_F(HTTPSRequestTest, ResumeTest) {
ssl_options.record_resume = true;
TestServer test_server(TestServer::TYPE_HTTPS,
ssl_options,
- base::FilePath(FILE_PATH_LITERAL("net/data/ssl")));
+ TestServer::GetSourceRelativePath(base::FilePath(
+ FILE_PATH_LITERAL("net/data/ssl"))));
ASSERT_TRUE(test_server.Start());
SSLClientSocket::ClearSessionCache();
@@ -4586,7 +4599,8 @@ TEST_F(HTTPSRequestTest, SSLSessionCacheShardTest) {
ssl_options.record_resume = true;
TestServer test_server(TestServer::TYPE_HTTPS,
ssl_options,
- base::FilePath(FILE_PATH_LITERAL("net/data/ssl")));
+ TestServer::GetSourceRelativePath(base::FilePath(
+ FILE_PATH_LITERAL("net/data/ssl"))));
ASSERT_TRUE(test_server.Start());
SSLClientSocket::ClearSessionCache();
@@ -4722,7 +4736,8 @@ class HTTPSOCSPTest : public HTTPSRequestTest {
*out_cert_status = 0;
TestServer test_server(TestServer::TYPE_HTTPS,
ssl_options,
- base::FilePath(FILE_PATH_LITERAL("net/data/ssl")));
+ TestServer::GetSourceRelativePath(base::FilePath(
+ FILE_PATH_LITERAL("net/data/ssl"))));
ASSERT_TRUE(test_server.Start());
TestDelegate d;
@@ -5016,7 +5031,7 @@ class URLRequestTestFTP : public URLRequestTest {
public:
URLRequestTestFTP()
: test_server_(TestServer::TYPE_FTP, TestServer::kLocalhost,
- base::FilePath()) {
+ TestServer::GetSourcePath()) {
}
protected:
« net/test/remote_test_server.h ('K') | « net/url_request/url_request_context_builder_unittest.cc ('k') | sync/internal_api/http_bridge_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698