Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Another go at fixing one-word commands
Browse files Browse the repository at this point in the history
I messed this up last time I tried (#7239 / e13c6c7).
  • Loading branch information
richvdh committed Apr 22, 2020
1 parent 7c7618c commit ed8eb30
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 1 deletion.
1 change: 1 addition & 0 deletions changelog.d/7326.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Move catchup of replication streams logic to worker.
2 changes: 1 addition & 1 deletion synapse/replication/tcp/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ def parse_command_from_line(line: str) -> Command:
Line should already be stripped of whitespace and be checked if blank.
"""

idx = line.index(" ")
idx = line.find(" ")
if idx >= 0:
cmd_name = line[:idx]
rest_of_line = line[idx + 1 :]
Expand Down
42 changes: 42 additions & 0 deletions tests/replication/tcp/test_commands.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# -*- coding: utf-8 -*-
# Copyright 2020 The Matrix.org Foundation C.I.C.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from synapse.replication.tcp.commands import (
RdataCommand,
ReplicateCommand,
parse_command_from_line,
)

from tests.unittest import TestCase


class ParseCommandTestCase(TestCase):
def test_parse_one_word_command(self):
line = "REPLICATE"
cmd = parse_command_from_line(line)
self.assertIsInstance(cmd, ReplicateCommand)

def test_parse_rdata(self):
line = 'RDATA events 6287863 ["ev", ["$eventid", "!roomid", "type", null, null, null]]'
cmd = parse_command_from_line(line)
self.assertIsInstance(cmd, RdataCommand)
self.assertEqual(cmd.stream_name, "events")
self.assertEqual(cmd.token, 6287863)

def test_parse_rdata_batch(self):
line = 'RDATA presence batch ["@foo:example.com", "online"]'
cmd = parse_command_from_line(line)
self.assertIsInstance(cmd, RdataCommand)
self.assertEqual(cmd.stream_name, "presence")
self.assertIsNone(cmd.token)

0 comments on commit ed8eb30

Please sign in to comment.