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

Side by Side Diff: net/test/local_test_server.h

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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_TEST_LOCAL_TEST_SERVER_H_ 5 #ifndef NET_TEST_LOCAL_TEST_SERVER_H_
6 #define NET_TEST_LOCAL_TEST_SERVER_H_ 6 #define NET_TEST_LOCAL_TEST_SERVER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/process.h" 11 #include "base/process.h"
12 #include "net/test/base_test_server.h" 12 #include "net/test/base_test_server.h"
13 13
14 #if defined(OS_WIN) 14 #if defined(OS_WIN)
15 #include "base/win/scoped_handle.h" 15 #include "base/win/scoped_handle.h"
16 #endif 16 #endif
17 17
18 class CommandLine; 18 class CommandLine;
19 19
20 namespace net { 20 namespace net {
21 21
22 // The LocalTestServer runs an external Python-based test server in the 22 // The LocalTestServer runs an external Python-based test server in the
23 // same machine in which the LocalTestServer runs. 23 // same machine in which the LocalTestServer runs.
24 class LocalTestServer : public BaseTestServer { 24 class LocalTestServer : public BaseTestServer {
25 public: 25 public:
26 // Initialize a TestServer listening on a specific host (IP or hostname). 26 // Initialize a TestServer listening on a specific host (IP or hostname).
27 // |document_root| must be a relative path under the root tree. 27 // |document_root| must be an absolute path.
28 LocalTestServer(Type type, 28 LocalTestServer(Type type,
29 const std::string& host, 29 const std::string& host,
30 const base::FilePath& document_root); 30 const base::FilePath& document_root);
31 31
32 // Initialize a TestServer with a specific set of SSLOptions. 32 // Initialize a TestServer with a specific set of SSLOptions.
33 // |document_root| must be a relative path under the root tree. 33 // |document_root| must be an absolute path.
34 LocalTestServer(Type type, 34 LocalTestServer(Type type,
35 const SSLOptions& ssl_options, 35 const SSLOptions& ssl_options,
36 const base::FilePath& document_root); 36 const base::FilePath& document_root);
37 37
38 virtual ~LocalTestServer(); 38 virtual ~LocalTestServer();
39 39
40 // Start the test server and block until it's ready. Returns true on success. 40 // Start the test server and block until it's ready. Returns true on success.
41 bool Start() WARN_UNUSED_RESULT; 41 bool Start() WARN_UNUSED_RESULT;
42 42
43 // Start the test server without blocking. Use this if you need multiple test 43 // Start the test server without blocking. Use this if you need multiple test
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 int child_fd_; 108 int child_fd_;
109 file_util::ScopedFD child_fd_closer_; 109 file_util::ScopedFD child_fd_closer_;
110 #endif 110 #endif
111 111
112 DISALLOW_COPY_AND_ASSIGN(LocalTestServer); 112 DISALLOW_COPY_AND_ASSIGN(LocalTestServer);
113 }; 113 };
114 114
115 } // namespace net 115 } // namespace net
116 116
117 #endif // NET_TEST_LOCAL_TEST_SERVER_H_ 117 #endif // NET_TEST_LOCAL_TEST_SERVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698