diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 20:58:29 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 20:58:29 +0000 |
| commit | 4e7b5f9648f64152e7dc0e08844f917196972cf3 (patch) | |
| tree | bc7b47015bd7556f2641530bbaabf8d79415857a /net/test | |
| parent | 1770a859eb5c6cea0ac0704e62464c9e147c0b00 (diff) | |
| download | chromium_src-4e7b5f9648f64152e7dc0e08844f917196972cf3.zip chromium_src-4e7b5f9648f64152e7dc0e08844f917196972cf3.tar.gz chromium_src-4e7b5f9648f64152e7dc0e08844f917196972cf3.tar.bz2 | |
FTP: use an unmodified and more recent version of pyftpdlib fetched via DEPS
This will make it much easier to update pyftpdlib and might help
with FTP test flakiness.
BUG=none
Review URL: http://codereview.chromium.org/7492015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test')
| -rw-r--r-- | net/test/test_server.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/test/test_server.cc b/net/test/test_server.cc index b3821bb..dd36bce 100644 --- a/net/test/test_server.cc +++ b/net/test/test_server.cc @@ -288,15 +288,16 @@ bool TestServer::SetPythonPath() { LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT"; return false; } - third_party_dir = third_party_dir.Append(FILE_PATH_LITERAL("third_party")); + third_party_dir = third_party_dir.AppendASCII("third_party"); // For simplejson. (simplejson, unlike all the other python modules // we include, doesn't have an extra 'simplejson' directory, so we // need to include its parent directory, i.e. third_party_dir). AppendToPythonPath(third_party_dir); - AppendToPythonPath(third_party_dir.Append(FILE_PATH_LITERAL("tlslite"))); - AppendToPythonPath(third_party_dir.Append(FILE_PATH_LITERAL("pyftpdlib"))); + AppendToPythonPath(third_party_dir.AppendASCII("tlslite")); + AppendToPythonPath( + third_party_dir.AppendASCII("pyftpdlib").AppendASCII("src")); // Locate the Python code generated by the protocol buffers compiler. FilePath pyproto_code_dir; |