diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 02:20:27 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 02:20:27 +0000 |
| commit | a358fd8076527132d37e0262823abe3807da16b8 (patch) | |
| tree | 1eec17f4fdb7d112d917ff5dcb9907270a0a4173 /net/test | |
| parent | 640a7ba34abc2d48327034138d5f675378d33fb9 (diff) | |
| download | chromium_src-a358fd8076527132d37e0262823abe3807da16b8.zip chromium_src-a358fd8076527132d37e0262823abe3807da16b8.tar.gz chromium_src-a358fd8076527132d37e0262823abe3807da16b8.tar.bz2 | |
[Sync] Added a separate type for a sync server for testserver.py
Made live_sync_test.cc use its own test server instance.
Decomped all sync server code into their own classes (SyncHTTPServer and SyncPageHandler).
BUG=53934
TEST=sync integration tests
Review URL: http://codereview.chromium.org/4209002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65893 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test')
| -rw-r--r-- | net/test/test_server.cc | 3 | ||||
| -rw-r--r-- | net/test/test_server.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/net/test/test_server.cc b/net/test/test_server.cc index 9a89cc9..0e8c461 100644 --- a/net/test/test_server.cc +++ b/net/test/test_server.cc @@ -191,6 +191,7 @@ std::string TestServer::GetScheme() const { case TYPE_FTP: return "ftp"; case TYPE_HTTP: + case TYPE_SYNC: return "http"; case TYPE_HTTPS: return "https"; @@ -330,6 +331,8 @@ bool TestServer::AddCommandLineArguments(CommandLine* command_line) const { if (type_ == TYPE_FTP) { command_line->AppendArg("-f"); + } else if (type_ == TYPE_SYNC) { + command_line->AppendArg("--sync"); } else if (type_ == TYPE_HTTPS) { FilePath certificate_path(certificates_dir_); certificate_path = certificate_path.Append( diff --git a/net/test/test_server.h b/net/test/test_server.h index b639094..f819365 100644 --- a/net/test/test_server.h +++ b/net/test/test_server.h @@ -42,6 +42,7 @@ class TestServer { TYPE_FTP, TYPE_HTTP, TYPE_HTTPS, + TYPE_SYNC, }; // Container for various options to control how the HTTPS server is |