diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-22 18:59:05 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-22 18:59:05 +0000 |
| commit | af5906220cd3a563cb87f366ed209f94789aaf6d (patch) | |
| tree | 9743ada0ac0190a31cc609e5cc731a2c99dff2e8 | |
| parent | 997cf8f39cfe672441e76f5a997a957537e3dbf7 (diff) | |
| download | chromium_src-af5906220cd3a563cb87f366ed209f94789aaf6d.zip chromium_src-af5906220cd3a563cb87f366ed209f94789aaf6d.tar.gz chromium_src-af5906220cd3a563cb87f366ed209f94789aaf6d.tar.bz2 | |
Fix sync integration tests by fixing Python path.
The generated Python proto output paths now match the input paths.
Reland of r97696 with CHECK removed.
Review URL: http://codereview.chromium.org/7711005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97698 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/test/test_server.cc | 14 | ||||
| -rwxr-xr-x | net/tools/testserver/chromiumsync_test.py | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/net/test/test_server.cc b/net/test/test_server.cc index 8723215..d76430d 100644 --- a/net/test/test_server.cc +++ b/net/test/test_server.cc @@ -304,17 +304,19 @@ bool TestServer::SetPythonPath() { third_party_dir.AppendASCII("pyftpdlib").AppendASCII("src")); // Locate the Python code generated by the protocol buffers compiler. - FilePath pyproto_code_dir; - if (!GetPyProtoPath(&pyproto_code_dir)) { + FilePath pyproto_dir; + if (!GetPyProtoPath(&pyproto_dir)) { LOG(WARNING) << "Cannot find pyproto dir for generated code. " << "Testserver features that rely on it will not work"; return true; } - AppendToPythonPath(pyproto_code_dir); - AppendToPythonPath(pyproto_code_dir.Append(FILE_PATH_LITERAL("sync_pb"))); - AppendToPythonPath(pyproto_code_dir.Append( - FILE_PATH_LITERAL("device_management_pb"))); + AppendToPythonPath(pyproto_dir); + AppendToPythonPath(pyproto_dir.AppendASCII("chrome") + .AppendASCII("browser") + .AppendASCII("sync") + .AppendASCII("protocol")); + AppendToPythonPath(pyproto_dir.AppendASCII("device_management_pb")); return true; } diff --git a/net/tools/testserver/chromiumsync_test.py b/net/tools/testserver/chromiumsync_test.py index 1872a9d..97e5f38 100755 --- a/net/tools/testserver/chromiumsync_test.py +++ b/net/tools/testserver/chromiumsync_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python # Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. |