mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-24 02:25:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix tests for leaves

Browse source
This commit is contained in:
Erik Johnston 2024-09-02 13:23:14 +01:00
parent b03dc0a997
commit bbcd1e9927
1 changed files with 8 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
tests/storage/test_sliding_sync_tables.py
View file

@ -3507,10 +3507,6 @@ class SlidingSyncTablesBackgroundUpdatesTestCase(SlidingSyncTablesTestCaseBase):
(room_id_no_info, user1_id), (room_id_no_info, user1_id),
(room_id_with_info, user1_id), (room_id_with_info, user1_id),
(space_room_id, user1_id), (space_room_id, user1_id),
# The leave memberships for user2
(room_id_no_info, user2_id),
(room_id_with_info, user2_id),
(space_room_id, user2_id),
}, },
exact=True, exact=True,
) )
@ -3892,16 +3888,12 @@ class SlidingSyncTablesBackgroundUpdatesTestCase(SlidingSyncTablesTestCaseBase):
# Reject the remote invites. # Reject the remote invites.
# Also try retracting a remote invite. # Also try retracting a remote invite.
room_id_unknown_state_leave_event_response = self.helper.leave( self.helper.leave(room_id_unknown_state, user1_id, tok=user1_tok)
room_id_unknown_state, user1_id, tok=user1_tok
)
room_id_no_info_leave_event = self._retract_remote_invite_for_user( room_id_no_info_leave_event = self._retract_remote_invite_for_user(
user_id=user1_id, user_id=user1_id,
remote_room_id=room_id_no_info, remote_room_id=room_id_no_info,
) )
room_id_with_info_leave_event_response = self.helper.leave( self.helper.leave(room_id_with_info, user1_id, tok=user1_tok)
room_id_with_info, user1_id, tok=user1_tok
)
space_room_id_leave_event = self._retract_remote_invite_for_user( space_room_id_leave_event = self._retract_remote_invite_for_user(
user_id=user1_id, user_id=user1_id,
remote_room_id=space_room_id, remote_room_id=space_room_id,
@ -3956,37 +3948,11 @@ class SlidingSyncTablesBackgroundUpdatesTestCase(SlidingSyncTablesTestCaseBase):
set(sliding_sync_membership_snapshots_results.keys()), set(sliding_sync_membership_snapshots_results.keys()),
{ {
# The invite memberships for user1 # The invite memberships for user1
(room_id_unknown_state, user1_id),
(room_id_no_info, user1_id), (room_id_no_info, user1_id),
(room_id_with_info, user1_id),
(space_room_id, user1_id), (space_room_id, user1_id),
}, },
exact=True, exact=True,
) )
self.assertEqual(
sliding_sync_membership_snapshots_results.get(
(room_id_unknown_state, user1_id)
),
_SlidingSyncMembershipSnapshotResult(
room_id=room_id_unknown_state,
user_id=user1_id,
sender=user1_id,
membership_event_id=room_id_unknown_state_leave_event_response[
"event_id"
],
membership=Membership.LEAVE,
event_stream_ordering=self.get_success(
self.store.get_position_for_event(
room_id_unknown_state_leave_event_response["event_id"]
)
).stream,
has_known_state=False,
room_type=None,
room_name=None,
is_encrypted=False,
tombstone_successor_room_id=None,
),
)
self.assertEqual( self.assertEqual(
sliding_sync_membership_snapshots_results.get((room_id_no_info, user1_id)), sliding_sync_membership_snapshots_results.get((room_id_no_info, user1_id)),
_SlidingSyncMembershipSnapshotResult( _SlidingSyncMembershipSnapshotResult(
@ -4003,28 +3969,6 @@ class SlidingSyncTablesBackgroundUpdatesTestCase(SlidingSyncTablesTestCaseBase):
tombstone_successor_room_id=None, tombstone_successor_room_id=None,
), ),
) )
self.assertEqual(
sliding_sync_membership_snapshots_results.get(
(room_id_with_info, user1_id)
),
_SlidingSyncMembershipSnapshotResult(
room_id=room_id_with_info,
user_id=user1_id,
sender=user1_id,
membership_event_id=room_id_with_info_leave_event_response["event_id"],
membership=Membership.LEAVE,
event_stream_ordering=self.get_success(
self.store.get_position_for_event(
room_id_with_info_leave_event_response["event_id"]
)
).stream,
has_known_state=True,
room_type=None,
room_name="my super duper room",
is_encrypted=True,
tombstone_successor_room_id=None,
),
)
self.assertEqual( self.assertEqual(
sliding_sync_membership_snapshots_results.get((space_room_id, user1_id)), sliding_sync_membership_snapshots_results.get((space_room_id, user1_id)),
_SlidingSyncMembershipSnapshotResult( _SlidingSyncMembershipSnapshotResult(
@ -4220,10 +4164,6 @@ class SlidingSyncTablesBackgroundUpdatesTestCase(SlidingSyncTablesTestCaseBase):
(room_id_no_info, user1_id), (room_id_no_info, user1_id),
(room_id_with_info, user1_id), (room_id_with_info, user1_id),
(space_room_id, user1_id), (space_room_id, user1_id),
# The leave memberships for user2
(room_id_no_info, user2_id),
(room_id_with_info, user2_id),
(space_room_id, user2_id),
}, },
exact=True, exact=True,
) )
@ -4312,7 +4252,7 @@ class SlidingSyncTablesBackgroundUpdatesTestCase(SlidingSyncTablesTestCaseBase):
# User1 joins the room # User1 joins the room
self.helper.join(room_id, user1_id, tok=user1_tok) self.helper.join(room_id, user1_id, tok=user1_tok)
# User1 leaves the room (we have to leave in order to forget the room) # User1 leaves the room (we have to leave in order to forget the room)
self.helper.leave(room_id, user1_id, tok=user1_tok) self.helper.leave(room_id, user1_id, tok=user2_tok)
state_map = self.get_success( state_map = self.get_success(
self.storage_controllers.state.get_current_state(room_id) self.storage_controllers.state.get_current_state(room_id)
@ -4381,7 +4321,7 @@ class SlidingSyncTablesBackgroundUpdatesTestCase(SlidingSyncTablesTestCaseBase):
_SlidingSyncMembershipSnapshotResult( _SlidingSyncMembershipSnapshotResult(
room_id=room_id, room_id=room_id,
user_id=user1_id, user_id=user1_id,
sender=user1_id, sender=user2_id,
membership_event_id=state_map[(EventTypes.Member, user1_id)].event_id, membership_event_id=state_map[(EventTypes.Member, user1_id)].event_id,
membership=Membership.LEAVE, membership=Membership.LEAVE,
event_stream_ordering=state_map[ event_stream_ordering=state_map[
@ -4820,7 +4760,7 @@ class SlidingSyncTablesCatchUpBackgroundUpdatesTestCase(SlidingSyncTablesTestCas
) )
# User2 leaves the room # User2 leaves the room
self.helper.leave(room_id, user2_id, tok=user2_tok) self.helper.leave(room_id, user2_id, tok=user1_tok)
# Make sure all of the background updates have finished before we start the # Make sure all of the background updates have finished before we start the
# catch-up. Even though it should work fine if the other background update is # catch-up. Even though it should work fine if the other background update is
@ -4841,6 +4781,9 @@ class SlidingSyncTablesCatchUpBackgroundUpdatesTestCase(SlidingSyncTablesTestCas
keyvalues={"room_id": room_id, "user_id": user2_id}, keyvalues={"room_id": room_id, "user_id": user2_id},
updatevalues={ updatevalues={
# Reset everything back to the value before user2 left the room # Reset everything back to the value before user2 left the room
"sender": sliding_sync_membership_snapshots_results_before_membership_changes[
(room_id, user2_id)
].sender,
"membership": sliding_sync_membership_snapshots_results_before_membership_changes[ "membership": sliding_sync_membership_snapshots_results_before_membership_changes[
(room_id, user2_id) (room_id, user2_id)
].membership, ].membership,