diff --git a/tests/federation/transport/test_knocking.py b/tests/federation/transport/test_knocking.py
index 121aa88cfa..8c215d50f2 100644
--- a/tests/federation/transport/test_knocking.py
+++ b/tests/federation/transport/test_knocking.py
@@ -25,9 +25,6 @@ from synapse.types import RoomAlias
from tests.test_utils import event_injection
from tests.unittest import FederatingHomeserverTestCase, TestCase, override_config
-# An identifier to use while MSC2304 is not in a stable release of the spec
-KNOCK_UNSTABLE_IDENTIFIER = "xyz.amorgan.knock"
-
class KnockingStrippedStateEventHelperMixin(TestCase):
def send_example_state_events_to_room(
@@ -61,7 +58,7 @@ class KnockingStrippedStateEventHelperMixin(TestCase):
self.get_success(
event_injection.inject_event(
hs,
- room_version=RoomVersions.MSC2403.identifier,
+ room_version=RoomVersions.V7.identifier,
room_id=room_id,
sender=sender,
type="com.example.secret",
@@ -121,7 +118,7 @@ class KnockingStrippedStateEventHelperMixin(TestCase):
self.get_success(
event_injection.inject_event(
hs,
- room_version=RoomVersions.MSC2403.identifier,
+ room_version=RoomVersions.V7.identifier,
room_id=room_id,
sender=sender,
type=event_type,
@@ -135,7 +132,7 @@ class KnockingStrippedStateEventHelperMixin(TestCase):
room_state[EventTypes.Create] = {
"content": {
"creator": sender,
- "room_version": RoomVersions.MSC2403.identifier,
+ "room_version": RoomVersions.V7.identifier,
},
"state_key": "",
}
@@ -232,7 +229,7 @@ class FederationKnockingTestCase(
room_id = self.helper.create_room_as(
"u1",
is_public=False,
- room_version=RoomVersions.MSC2403.identifier,
+ room_version=RoomVersions.V7.identifier,
tok=user_token,
)
@@ -243,14 +240,13 @@ class FederationKnockingTestCase(
channel = self.make_request(
"GET",
- "/_matrix/federation/unstable/%s/make_knock/%s/%s?ver=%s"
+ "/_matrix/federation/v1/make_knock/%s/%s?ver=%s"
% (
- KNOCK_UNSTABLE_IDENTIFIER,
room_id,
fake_knocking_user_id,
# Inform the remote that we support the room version of the room we're
# knocking on
- RoomVersions.MSC2403.identifier,
+ RoomVersions.V7.identifier,
),
)
self.assertEquals(200, channel.code, channel.result)
@@ -275,7 +271,7 @@ class FederationKnockingTestCase(
self.clock,
self.hs.hostname,
self.hs.signing_key,
- room_version=RoomVersions.MSC2403,
+ room_version=RoomVersions.V7,
event_dict=knock_event,
)
@@ -287,8 +283,8 @@ class FederationKnockingTestCase(
# Send the signed knock event into the room
channel = self.make_request(
"PUT",
- "/_matrix/federation/unstable/%s/send_knock/%s/%s"
- % (KNOCK_UNSTABLE_IDENTIFIER, room_id, signed_knock_event.event_id),
+ "/_matrix/federation/v1/send_knock/%s/%s"
+ % (room_id, signed_knock_event.event_id),
signed_knock_event_json,
)
self.assertEquals(200, channel.code, channel.result)
diff --git a/tests/rest/client/v2_alpha/test_sync.py b/tests/rest/client/v2_alpha/test_sync.py
index be5737e420..b52f78ba69 100644
--- a/tests/rest/client/v2_alpha/test_sync.py
+++ b/tests/rest/client/v2_alpha/test_sync.py
@@ -333,7 +333,7 @@ class SyncKnockTestCase(
self.room_id = self.helper.create_room_as(
self.user_id,
is_public=False,
- room_version="xyz.amorgan.knock",
+ room_version="7",
tok=self.tok,
)
@@ -363,7 +363,7 @@ class SyncKnockTestCase(
# Knock on a room
channel = self.make_request(
"POST",
- "/_matrix/client/unstable/xyz.amorgan.knock/%s" % (self.room_id,),
+ "/_matrix/client/r0/knock/%s" % (self.room_id,),
b"{}",
self.knocker_tok,
)
@@ -371,7 +371,7 @@ class SyncKnockTestCase(
# We expect to see the knock event in the stripped room state later
self.expected_room_state[EventTypes.Member] = {
- "content": {"membership": "xyz.amorgan.knock", "displayname": "knocker"},
+ "content": {"membership": "knock", "displayname": "knocker"},
"state_key": "@knocker:test",
}
@@ -384,7 +384,7 @@ class SyncKnockTestCase(
self.assertEqual(channel.code, 200, channel.json_body)
# Extract the stripped room state events from /sync
- knock_entry = channel.json_body["rooms"]["xyz.amorgan.knock"]
+ knock_entry = channel.json_body["rooms"]["knock"]
room_state_events = knock_entry[self.room_id]["knock_state"]["events"]
# Validate that the knock membership event came last
|
