summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2021-03-18 17:26:13 +0000
committerGitHub <noreply@github.com>2021-03-18 17:26:13 +0000
commit7a61b0e7524e53683c5a9b21c3b4154ca2a7a4fe (patch)
tree5df590c05eecebcb4f5c83141b18ab7e43211e2a /tests
parentAllow knock->knock transitions (#86) (diff)
downloadsynapse-7a61b0e7524e53683c5a9b21c3b4154ca2a7a4fe.tar.xz
Change knock room version to v7 (#88)
Diffstat (limited to 'tests')
-rw-r--r--tests/federation/transport/test_knocking.py10
-rw-r--r--tests/rest/client/v2_alpha/test_sync.py3
2 files changed, 7 insertions, 6 deletions
diff --git a/tests/federation/transport/test_knocking.py b/tests/federation/transport/test_knocking.py

index f60fdd7983..38dc0e5aa2 100644 --- a/tests/federation/transport/test_knocking.py +++ b/tests/federation/transport/test_knocking.py
@@ -61,7 +61,7 @@ class KnockingStrippedStateEventHelperMixin(TestCase): self.get_success( event_injection.inject_event( hs, - room_version=RoomVersions.MSC2403_DEV.identifier, + room_version=RoomVersions.V7.identifier, room_id=room_id, sender=sender, type="com.example.secret", @@ -121,7 +121,7 @@ class KnockingStrippedStateEventHelperMixin(TestCase): self.get_success( event_injection.inject_event( hs, - room_version=RoomVersions.MSC2403_DEV.identifier, + room_version=RoomVersions.V7.identifier, room_id=room_id, sender=sender, type=event_type, @@ -218,7 +218,7 @@ class FederationKnockingTestCase( room_id = self.helper.create_room_as( "u1", is_public=False, - room_version=RoomVersions.MSC2403_DEV.identifier, + room_version=RoomVersions.V7.identifier, tok=user_token, ) @@ -236,7 +236,7 @@ class FederationKnockingTestCase( fake_knocking_user_id, # Inform the remote that we support the room version of the room we're # knocking on - RoomVersions.MSC2403_DEV.identifier, + RoomVersions.V7.identifier, ), ) self.assertEquals(200, channel.code, channel.result) @@ -261,7 +261,7 @@ class FederationKnockingTestCase( self.clock, self.hs.hostname, self.hs.signing_key, - room_version=RoomVersions.MSC2403_DEV, + room_version=RoomVersions.V7, event_dict=knock_event, ) diff --git a/tests/rest/client/v2_alpha/test_sync.py b/tests/rest/client/v2_alpha/test_sync.py
index f2e3627c2c..8481654ae8 100644 --- a/tests/rest/client/v2_alpha/test_sync.py +++ b/tests/rest/client/v2_alpha/test_sync.py
@@ -17,6 +17,7 @@ import json import synapse.rest.admin from synapse.api.constants import EventContentFields, EventTypes, RelationTypes +from synapse.api.room_versions import RoomVersions from synapse.rest.client.v1 import login, room from synapse.rest.client.v2_alpha import knock, read_marker, sync @@ -342,7 +343,7 @@ class SyncKnockTestCase( self.room_id = self.helper.create_room_as( self.user_id, is_public=False, - room_version="xyz.amorgan.knock", + room_version=RoomVersions.V7.identifier, tok=self.tok, )