sync/tools/testserver/chromiumsync.py - Issue 38803003: sync: Implement per-type update processing

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sync/tools/testserver/chromiumsync.py

Issue 38803003: sync: Implement per-type update processing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix integration tests Created 7 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: sync/tools/testserver/chromiumsync.py

diff --git a/sync/tools/testserver/chromiumsync.py b/sync/tools/testserver/chromiumsync.py

index 800917e8c2b356a4ed6384f3825f0a45d2d90b2b..7e898c2b572bd30e116b2008db0c177f7674d576 100644

--- a/sync/tools/testserver/chromiumsync.py

+++ b/sync/tools/testserver/chromiumsync.py

@@ -451,8 +451,7 @@ class UpdateSieve(object):

final_stamp = max(old_timestamp, new_timestamp)

final_migration = self._migration_history.GetLatestVersion(data_type)

new_marker.token = pickle.dumps((final_stamp, final_migration))

- if new_marker not in self._original_request.from_progress_marker:

- get_updates_response.new_progress_marker.add().MergeFrom(new_marker)

+ get_updates_response.new_progress_marker.add().MergeFrom(new_marker)

elif self._original_request.HasField('from_timestamp'):

if self._original_request.from_timestamp < new_timestamp:

get_updates_response.new_timestamp = new_timestamp