diff options
| author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 23:24:05 +0000 |
|---|---|---|
| committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 23:24:05 +0000 |
| commit | 0e0c7bcff33644d5c2753fbfc4dafe44acf691b7 (patch) | |
| tree | dbc41257dcc46d54d99fcb101fc9bee4787fe4b6 /net/test/test_server.h | |
| parent | 606c75d600d3f564216de1d744c67a1ae1d6ce4a (diff) | |
| download | chromium_src-0e0c7bcff33644d5c2753fbfc4dafe44acf691b7.zip chromium_src-0e0c7bcff33644d5c2753fbfc4dafe44acf691b7.tar.gz chromium_src-0e0c7bcff33644d5c2753fbfc4dafe44acf691b7.tar.bz2 | |
Revert 64118 - Revert 64070 - Revert 64065 - testserver.py listens on ephemeral ports by default.
(Reason for revert: this causes SSLUITests on Mac OS to hang with high probability)
If --port is specified on the command line, testserver.py will listen on that port, otherwise it will listen on an ephemeral port. If --startup_pipe is specified, the port number is written to the pipe as a 2 byte unsigned int in host order.
TestServer by default spawns testserver.py to listen on an ephemeral port and reads the port value from the pipe. If necessary, the port can still be fixed using TestServer::ForcePort, but that will hopefully get deprecated quickly.
BUG=56814
TEST=try bots pass
Review URL: http://codereview.chromium.org/3549003
TBR=cbentzel@chromium.org
Review URL: http://codereview.chromium.org/4165004
TBR=cbentzel@chromium.org
Review URL: http://codereview.chromium.org/4146008
TBR=cbentzel@chromium.org
Review URL: http://codereview.chromium.org/4164008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64175 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test/test_server.h')
| -rw-r--r-- | net/test/test_server.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/test/test_server.h b/net/test/test_server.h index 2ee801e..4e68fd9 100644 --- a/net/test/test_server.h +++ b/net/test/test_server.h @@ -53,7 +53,7 @@ class TestServer { bool Stop(); const FilePath& document_root() const { return document_root_; } - const HostPortPair& host_port_pair() const; + const HostPortPair& host_port_pair() const { return host_port_pair_; } std::string GetScheme() const; bool GetAddressList(AddressList* address_list) const WARN_UNUSED_RESULT; @@ -121,9 +121,6 @@ class TestServer { Type type_; - // Has the server been started? - bool started_; - DISALLOW_COPY_AND_ASSIGN(TestServer); }; |