components/sync/tools/testserver/chromiumsync.py - Issue 2568543004: [Sync] Enable USS DeviceInfo for bots.

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: components/sync/tools/testserver/chromiumsync.py

Issue 2568543004: [Sync] Enable USS DeviceInfo for bots. (Closed)

Patch Set: Actually rebasing this time. Created 4 years 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: components/sync/tools/testserver/chromiumsync.py

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

index cfcf54b68fb78d30ff2041b12f48dbb5ba292583..e6f19913fb2df7e8da1677aedba4c2be19d0a1d4 100644

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

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

@@ -429,10 +429,8 @@ class UpdateSieve(object):

elif marker.token:

(timestamp, version) = pickle.loads(marker.token)

self._migration_versions_to_check[data_type] = version

- elif marker.HasField('token'):

- timestamp = 0

else:

- raise ValueError('No timestamp information in progress marker.')

+ timestamp = 0

data_type = ProtocolDataTypeIdToSyncType(marker.data_type_id)

self._state[data_type] = timestamp

elif request.HasField('from_timestamp'):