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

Optimise room creation event lookups part 2 #13224

Merged
merged 10 commits into from
Jul 13, 2022
Merged

Optimise room creation event lookups part 2 #13224

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cda6c45
Add optional depth override argument to room member event creation
Fizzadar Jul 8, 2022
567af71
Define depth when creating events in a new room
Fizzadar Jul 8, 2022
7ab5f1a
Linting
Fizzadar Jul 12, 2022
4c846e4
Update room create tests
Fizzadar Jul 12, 2022
5f021b6
Add changelog file
Fizzadar Jul 12, 2022
98414ef
Fix missing last sent event ID in membership sends on create room
Fizzadar Jul 12, 2022
7cedbd0
Pass depth & prev event during 3pid membership invites when creating …
Fizzadar Jul 12, 2022
8b2e781
Update 3pid create room tests
Fizzadar Jul 12, 2022
72d95c8
Fix handling of 3pid invites
Fizzadar Jul 13, 2022
0bedb82
Fixup 3pid room creation unit test
Fizzadar Jul 13, 2022
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
4 changes: 2 additions & 2 deletions tests/rest/client/test_rooms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ def test_post_room_no_keys(self) -> None:
self.assertEqual(200, channel.code, channel.result)
self.assertTrue("room_id" in channel.json_body)
assert channel.resource_usage is not None
self.assertEqual(37, channel.resource_usage.db_txn_count)
self.assertEqual(32, channel.resource_usage.db_txn_count)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!


def test_post_room_initial_state(self) -> None:
# POST with initial_state config key, expect new room id
Expand All @@ -722,7 +722,7 @@ def test_post_room_initial_state(self) -> None:
self.assertEqual(200, channel.code, channel.result)
self.assertTrue("room_id" in channel.json_body)
assert channel.resource_usage is not None
self.assertEqual(41, channel.resource_usage.db_txn_count)
self.assertEqual(35, channel.resource_usage.db_txn_count)

def test_post_room_visibility_key(self) -> None:
# POST with visibility config key, expect new room id
Expand Down