mirror of
https://mau.dev/maunium/synapse.git
synced 2024-12-13 14:33:14 +01:00
fix mypy for tests/replication (#7518)
This commit is contained in:
parent
c29915bd05
commit
164f50f5f2
4 changed files with 9 additions and 14 deletions
1
changelog.d/7518.misc
Normal file
1
changelog.d/7518.misc
Normal file
|
@ -0,0 +1 @@
|
|||
Fix typing annotations in `tests.replication`.
|
|
@ -17,11 +17,12 @@ from canonicaljson import encode_canonical_json
|
|||
|
||||
from synapse.api.room_versions import RoomVersions
|
||||
from synapse.events import FrozenEvent, _EventInternalMetadata, make_event_from_dict
|
||||
from synapse.events.snapshot import EventContext
|
||||
from synapse.handlers.room import RoomEventSource
|
||||
from synapse.replication.slave.storage.events import SlavedEventStore
|
||||
from synapse.storage.roommember import RoomsForUser
|
||||
|
||||
from tests.server import FakeTransport
|
||||
|
||||
from ._base import BaseSlavedStoreTestCase
|
||||
|
||||
USER_ID = "@feeling:test"
|
||||
|
@ -240,6 +241,7 @@ class SlavedEventStoreTestCase(BaseSlavedStoreTestCase):
|
|||
|
||||
# limit the replication rate
|
||||
repl_transport = self._server_transport
|
||||
assert isinstance(repl_transport, FakeTransport)
|
||||
repl_transport.autoflush = False
|
||||
|
||||
# build the join and message events and persist them in the same batch.
|
||||
|
@ -322,7 +324,6 @@ class SlavedEventStoreTestCase(BaseSlavedStoreTestCase):
|
|||
type="m.room.message",
|
||||
key=None,
|
||||
internal={},
|
||||
state=None,
|
||||
depth=None,
|
||||
prev_events=[],
|
||||
auth_events=[],
|
||||
|
@ -362,13 +363,6 @@ class SlavedEventStoreTestCase(BaseSlavedStoreTestCase):
|
|||
event = make_event_from_dict(event_dict, internal_metadata_dict=internal)
|
||||
|
||||
self.event_id += 1
|
||||
|
||||
if state is not None:
|
||||
state_ids = {key: e.event_id for key, e in state.items()}
|
||||
context = EventContext.with_state(
|
||||
state_group=None, current_state_ids=state_ids, prev_state_ids=state_ids
|
||||
)
|
||||
else:
|
||||
state_handler = self.hs.get_state_handler()
|
||||
context = self.get_success(state_handler.compute_event_context(event))
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@ class ParseCommandTestCase(TestCase):
|
|||
def test_parse_rdata(self):
|
||||
line = 'RDATA events master 6287863 ["ev", ["$eventid", "!roomid", "type", null, null, null]]'
|
||||
cmd = parse_command_from_line(line)
|
||||
self.assertIsInstance(cmd, RdataCommand)
|
||||
assert isinstance(cmd, RdataCommand)
|
||||
self.assertEqual(cmd.stream_name, "events")
|
||||
self.assertEqual(cmd.instance_name, "master")
|
||||
self.assertEqual(cmd.token, 6287863)
|
||||
|
@ -38,7 +38,7 @@ class ParseCommandTestCase(TestCase):
|
|||
def test_parse_rdata_batch(self):
|
||||
line = 'RDATA presence master batch ["@foo:example.com", "online"]'
|
||||
cmd = parse_command_from_line(line)
|
||||
self.assertIsInstance(cmd, RdataCommand)
|
||||
assert isinstance(cmd, RdataCommand)
|
||||
self.assertEqual(cmd.stream_name, "presence")
|
||||
self.assertEqual(cmd.instance_name, "master")
|
||||
self.assertIsNone(cmd.token)
|
||||
|
|
2
tox.ini
2
tox.ini
|
@ -207,7 +207,7 @@ commands = mypy \
|
|||
synapse/storage/util \
|
||||
synapse/streams \
|
||||
synapse/util/caches/stream_change_cache.py \
|
||||
tests/replication/tcp/streams \
|
||||
tests/replication \
|
||||
tests/test_utils \
|
||||
tests/rest/client/v2_alpha/test_auth.py \
|
||||
tests/util/test_stream_change_cache.py
|
||||
|
|
Loading…
Reference in a new issue