Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions synapse/types/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,11 @@ async def parse(cls, store: "PurgeEventsStore", string: str) -> "RoomStreamToken

instance_map = {}
for part in parts[1:]:
if not part:
# Handle tokens of the form `m5~`, which were created by
# a bug
continue

key, value = part.split(".")
instance_id = int(key)
pos = int(value)
Expand Down Expand Up @@ -778,6 +783,11 @@ async def parse(cls, store: "DataStore", string: str) -> "MultiWriterStreamToken

instance_map = {}
for part in parts[1:]:
if not part:
# Handle tokens of the form `m5~`, which were created by
# a bug
continue

key, value = part.split(".")
instance_id = int(key)
pos = int(value)
Expand Down
8 changes: 8 additions & 0 deletions tests/test_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,3 +167,11 @@ def test_instance_map_assertion(self) -> None:

with self.assertRaises(ValueError):
RoomStreamToken(stream=5, instance_map=immutabledict({"foo": 4}))

def test_parse_bad_token(self) -> None:
"""Test that we can parse tokens produced by a bug in Synapse of the
form `m5~`"""
Comment thread
anoadragon453 marked this conversation as resolved.
store = self.hs.get_datastores().main

parsed_token = self.get_success(RoomStreamToken.parse(store, "m5~"))
self.assertEqual(parsed_token, RoomStreamToken(stream=5))