diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-02-07 09:22:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-07 09:22:15 +0000 |
| commit | e1b240329efec081414a3c700b4548aac2fa9bf2 (patch) | |
| tree | 90207cca0b6485852d540d32cfe842271cb0999a /tests | |
| parent | Limit the number of events that can be requested when backfilling events (#6864) (diff) | |
| parent | Pass room_version into `event_from_pdu_json` (diff) | |
| download | synapse-e1b240329efec081414a3c700b4548aac2fa9bf2.tar.xz | |
Merge pull request #6856 from matrix-org/rav/redact_changes/6
Pass room_version into `event_from_pdu_json`
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/handlers/test_federation.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py index b4d92cf732..132e35651d 100644 --- a/tests/handlers/test_federation.py +++ b/tests/handlers/test_federation.py @@ -99,6 +99,7 @@ class FederationTestCase(unittest.HomeserverTestCase): user_id = self.register_user("kermit", "test") tok = self.login("kermit", "test") room_id = self.helper.create_room_as(room_creator=user_id, tok=tok) + room_version = self.get_success(self.store.get_room_version(room_id)) # pretend that another server has joined join_event = self._build_and_send_join_event(OTHER_SERVER, OTHER_USER, room_id) @@ -120,7 +121,7 @@ class FederationTestCase(unittest.HomeserverTestCase): "auth_events": [], "origin_server_ts": self.clock.time_msec(), }, - join_event.format_version, + room_version, ) with LoggingContext(request="send_rejected"): @@ -149,6 +150,7 @@ class FederationTestCase(unittest.HomeserverTestCase): user_id = self.register_user("kermit", "test") tok = self.login("kermit", "test") room_id = self.helper.create_room_as(room_creator=user_id, tok=tok) + room_version = self.get_success(self.store.get_room_version(room_id)) # pretend that another server has joined join_event = self._build_and_send_join_event(OTHER_SERVER, OTHER_USER, room_id) @@ -171,7 +173,7 @@ class FederationTestCase(unittest.HomeserverTestCase): "auth_events": [], "origin_server_ts": self.clock.time_msec(), }, - join_event.format_version, + room_version, ) with LoggingContext(request="send_rejected"): |