diff options
| author | braffert@chromium.org <braffert@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-29 19:49:03 +0000 |
|---|---|---|
| committer | braffert@chromium.org <braffert@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-29 19:49:03 +0000 |
| commit | 7b597ec816c31706b33d45ab25ee966975c73a20 (patch) | |
| tree | b2bb45c7cc7346d430cb0dd602805dce425453aa /net/tools | |
| parent | f91e6357489e0e36f943bca3d977c266e8375a50 (diff) | |
| download | chromium_src-7b597ec816c31706b33d45ab25ee966975c73a20.zip chromium_src-7b597ec816c31706b33d45ab25ee966975c73a20.tar.gz chromium_src-7b597ec816c31706b33d45ab25ee966975c73a20.tar.bz2 | |
Adjust exception handling syntax in sync test server.
The newly added sync perf tests fail on mac 10.5, but succeed on all other platforms.
On mac 10.5, the sync test server cannot be launched due to a syntax error. It turns
out that the sync test server had two instances of the except-as syntax, which was
added in Python3 and ported to 2.6, but not 2.5, which is the default on mac 10.5.
BUG=91006
TEST=sync_performance_tests, sync_integration_tests
Review URL: http://codereview.chromium.org/7531031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94739 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
| -rwxr-xr-x | net/tools/testserver/chromiumsync.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tools/testserver/chromiumsync.py b/net/tools/testserver/chromiumsync.py index 3c0255f..8257009 100755 --- a/net/tools/testserver/chromiumsync.py +++ b/net/tools/testserver/chromiumsync.py @@ -958,7 +958,7 @@ class TestServer(object): print 'Unrecognizable sync request!' return (400, None) # Bad request. return (200, response.SerializeToString()) - except MigrationDoneError as error: + except MigrationDoneError, error: print_context('<-') print 'MIGRATION_DONE: <%s>' % (ShortDatatypeListSummary(error.datatypes)) response = sync_pb2.ClientToServerResponse() @@ -967,7 +967,7 @@ class TestServer(object): response.migrated_data_type_id[:] = [ SyncTypeToProtocolDataTypeId(x) for x in error.datatypes] return (200, response.SerializeToString()) - except StoreBirthdayError as error: + except StoreBirthdayError, error: print_context('<-') print 'NOT_MY_BIRTHDAY' response = sync_pb2.ClientToServerResponse() |