diff options
Diffstat (limited to 'net/tools')
| -rwxr-xr-x | net/tools/testserver/chromiumsync.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/net/tools/testserver/chromiumsync.py b/net/tools/testserver/chromiumsync.py index 7801cdf..a15d265 100755 --- a/net/tools/testserver/chromiumsync.py +++ b/net/tools/testserver/chromiumsync.py @@ -36,7 +36,7 @@ ALL_TYPES = ( PASSWORD, PREFERENCE, # SESSION, - THEME,
+ THEME, TYPED_URL) = range(9) # Given a sync type from ALL_TYPES, find the extension token corresponding @@ -166,7 +166,7 @@ class SyncDataModel(object): parent_tag='google_chrome', sync_type=EXTENSIONS), PermanentItem('google_chrome_passwords', name='Passwords', parent_tag='google_chrome', sync_type=PASSWORD), - # TODO(rsimha): Disabled since the protocol does not support it yet.
+ # TODO(rsimha): Disabled since the protocol does not support it yet. # PermanentItem('google_chrome_sessions', name='Sessions', # parent_tag='google_chrome', SESSION), PermanentItem('google_chrome_themes', name='Themes', @@ -516,7 +516,7 @@ class SyncDataModel(object): tombstone = sync_pb2.SyncEntity() tombstone.id_string = entry.id_string tombstone.deleted = True - tombstone.name = '' # 'name' is a required field; we're stuck with it. + tombstone.name = '' entry = tombstone else: # Comments in sync.proto detail how the representation of positional @@ -635,11 +635,14 @@ class TestServer(object): # of the operation. reply.id_string = server_entry.id_string if not server_entry.deleted: - reply.parent_id_string = server_entry.parent_id_string + # Note: the production server doesn't actually send the + # parent_id_string on commit responses, so we don't either. reply.position_in_parent = server_entry.position_in_parent reply.version = server_entry.version reply.name = server_entry.name reply.non_unique_name = server_entry.non_unique_name + else: + reply.version = entry.version + 1 def HandleGetUpdates(self, update_request, update_response): """Respond to a GetUpdates request by querying the user's account. |