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

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@erikjohnston
erikjohnston committed May 21, 2022
1 parent 8b33331 commit f9d470b
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 18 deletions.
4 changes: 3 additions & 1 deletion tests/handlers/test_federation.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,9 @@ def test_backfill_with_many_backward_extremities(self) -> None:
# federation handler wanting to backfill the fake event.
self.get_success(
federation_event_handler._process_received_pdu(
self.OTHER_SERVER_NAME, event, state=current_state
self.OTHER_SERVER_NAME,
event,
state={(e.type, e.state_key): e.event_id for e in current_state},
)
)

Expand Down
43 changes: 28 additions & 15 deletions tests/storage/test_events.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def prepare(self, reactor, clock, homeserver):
def persist_event(self, event, state=None):
"""Persist the event, with optional state"""
context = self.get_success(
self.state.compute_event_context(event, old_state=state)
self.state.compute_event_context(event, state_ids_before_event=state)
)
self.get_success(self.persistence.persist_event(event, context))

Expand Down Expand Up @@ -103,9 +103,11 @@ def test_prune_gap(self):
RoomVersions.V6,
)

state_before_gap = self.get_success(self.state.get_current_state(self.room_id))
state_before_gap = self.get_success(
self.state.get_current_state_ids(self.room_id)
)

self.persist_event(remote_event_2, state=state_before_gap.values())
self.persist_event(remote_event_2, state=state_before_gap)

# Check the new extremity is just the new remote event.
self.assert_extremities([remote_event_2.event_id])
Expand Down Expand Up @@ -135,13 +137,14 @@ def test_do_not_prune_gap_if_state_different(self):
# setting. The state resolution across the old and new event will then
# include it, and so the resolved state won't match the new state.
state_before_gap = dict(
self.get_success(self.state.get_current_state(self.room_id))
self.get_success(self.state.get_current_state_ids(self.room_id))
)
state_before_gap.pop(("m.room.history_visibility", ""))

context = self.get_success(
self.state.compute_event_context(
remote_event_2, old_state=state_before_gap.values()
remote_event_2,
state_ids_before_event=state_before_gap,
)
)

Expand Down Expand Up @@ -177,9 +180,11 @@ def test_prune_gap_if_old(self):
RoomVersions.V6,
)

state_before_gap = self.get_success(self.state.get_current_state(self.room_id))
state_before_gap = self.get_success(
self.state.get_current_state_ids(self.room_id)
)

self.persist_event(remote_event_2, state=state_before_gap.values())
self.persist_event(remote_event_2, state=state_before_gap)

# Check the new extremity is just the new remote event.
self.assert_extremities([remote_event_2.event_id])
Expand Down Expand Up @@ -207,9 +212,11 @@ def test_do_not_prune_gap_if_other_server(self):
RoomVersions.V6,
)

state_before_gap = self.get_success(self.state.get_current_state(self.room_id))
state_before_gap = self.get_success(
self.state.get_current_state_ids(self.room_id)
)

self.persist_event(remote_event_2, state=state_before_gap.values())
self.persist_event(remote_event_2, state=state_before_gap)

# Check the new extremity is just the new remote event.
self.assert_extremities([self.remote_event_1.event_id, remote_event_2.event_id])
Expand Down Expand Up @@ -247,9 +254,11 @@ def test_prune_gap_if_dummy_remote(self):
RoomVersions.V6,
)

state_before_gap = self.get_success(self.state.get_current_state(self.room_id))
state_before_gap = self.get_success(
self.state.get_current_state_ids(self.room_id)
)

self.persist_event(remote_event_2, state=state_before_gap.values())
self.persist_event(remote_event_2, state=state_before_gap)

# Check the new extremity is just the new remote event.
self.assert_extremities([remote_event_2.event_id])
Expand Down Expand Up @@ -289,9 +298,11 @@ def test_prune_gap_if_dummy_local(self):
RoomVersions.V6,
)

state_before_gap = self.get_success(self.state.get_current_state(self.room_id))
state_before_gap = self.get_success(
self.state.get_current_state_ids(self.room_id)
)

self.persist_event(remote_event_2, state=state_before_gap.values())
self.persist_event(remote_event_2, state=state_before_gap)

# Check the new extremity is just the new remote event.
self.assert_extremities([remote_event_2.event_id, local_message_event_id])
Expand Down Expand Up @@ -323,9 +334,11 @@ def test_do_not_prune_gap_if_not_dummy(self):
RoomVersions.V6,
)

state_before_gap = self.get_success(self.state.get_current_state(self.room_id))
state_before_gap = self.get_success(
self.state.get_current_state_ids(self.room_id)
)

self.persist_event(remote_event_2, state=state_before_gap.values())
self.persist_event(remote_event_2, state=state_before_gap)

# Check the new extremity is just the new remote event.
self.assert_extremities([local_message_event_id, remote_event_2.event_id])
Expand Down
14 changes: 12 additions & 2 deletions tests/test_state.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,12 @@ def test_annotate_with_old_message(self):
]

context = yield defer.ensureDeferred(
self.state.compute_event_context(event, old_state=old_state)
self.state.compute_event_context(
event,
state_ids_before_event={
(e.type, e.state_key): e.event_id for e in old_state
},
)
)

prev_state_ids = yield defer.ensureDeferred(context.get_prev_state_ids())
Expand All @@ -467,7 +472,12 @@ def test_annotate_with_old_state(self):
]

context = yield defer.ensureDeferred(
self.state.compute_event_context(event, old_state=old_state)
self.state.compute_event_context(
event,
state_ids_before_event={
(e.type, e.state_key): e.event_id for e in old_state
},
)
)

prev_state_ids = yield defer.ensureDeferred(context.get_prev_state_ids())
Expand Down

0 comments on commit f9d470b

Please sign in to comment.