diff --git a/tests/handlers/test_oauth_delegation.py b/tests/handlers/test_oauth_delegation.py
index 9387d07de8..036c539db2 100644
--- a/tests/handlers/test_oauth_delegation.py
+++ b/tests/handlers/test_oauth_delegation.py
@@ -541,6 +541,8 @@ class MSC3861OAuthDelegation(HomeserverTestCase):
self.assertEqual(channel.code, 200, channel.json_body)
+ # Try uploading *different* keys; it should cause a 501 error.
+ keys_upload_body = self.make_device_keys(USER_ID, DEVICE)
channel = self.make_request(
"POST",
"/_matrix/client/v3/keys/device_signing/upload",
diff --git a/tests/rest/admin/test_admin.py b/tests/rest/admin/test_admin.py
index 22106eb786..5f6f7213b3 100644
--- a/tests/rest/admin/test_admin.py
+++ b/tests/rest/admin/test_admin.py
@@ -435,10 +435,6 @@ class ExperimentalFeaturesTestCase(unittest.HomeserverTestCase):
True,
channel.json_body["features"]["msc3881"],
)
- self.assertEqual(
- False,
- channel.json_body["features"]["msc3967"],
- )
# test nothing blows up if you try to disable a feature that isn't already enabled
url = f"{self.url}/{self.other_user}"
diff --git a/tests/rest/client/test_keys.py b/tests/rest/client/test_keys.py
index 5f0c005576..8bbd109092 100644
--- a/tests/rest/client/test_keys.py
+++ b/tests/rest/client/test_keys.py
@@ -155,71 +155,6 @@ class KeyQueryTestCase(unittest.HomeserverTestCase):
}
def test_device_signing_with_uia(self) -> None:
- """Device signing key upload requires UIA."""
- password = "wonderland"
- device_id = "ABCDEFGHI"
- alice_id = self.register_user("alice", password)
- alice_token = self.login("alice", password, device_id=device_id)
-
- content = self.make_device_keys(alice_id, device_id)
-
- channel = self.make_request(
- "POST",
- "/_matrix/client/v3/keys/device_signing/upload",
- content,
- alice_token,
- )
-
- self.assertEqual(channel.code, HTTPStatus.UNAUTHORIZED, channel.result)
- # Grab the session
- session = channel.json_body["session"]
- # Ensure that flows are what is expected.
- self.assertIn({"stages": ["m.login.password"]}, channel.json_body["flows"])
-
- # add UI auth
- content["auth"] = {
- "type": "m.login.password",
- "identifier": {"type": "m.id.user", "user": alice_id},
- "password": password,
- "session": session,
- }
-
- channel = self.make_request(
- "POST",
- "/_matrix/client/v3/keys/device_signing/upload",
- content,
- alice_token,
- )
-
- self.assertEqual(channel.code, HTTPStatus.OK, channel.result)
-
- @override_config({"ui_auth": {"session_timeout": "15m"}})
- def test_device_signing_with_uia_session_timeout(self) -> None:
- """Device signing key upload requires UIA buy passes with grace period."""
- password = "wonderland"
- device_id = "ABCDEFGHI"
- alice_id = self.register_user("alice", password)
- alice_token = self.login("alice", password, device_id=device_id)
-
- content = self.make_device_keys(alice_id, device_id)
-
- channel = self.make_request(
- "POST",
- "/_matrix/client/v3/keys/device_signing/upload",
- content,
- alice_token,
- )
-
- self.assertEqual(channel.code, HTTPStatus.OK, channel.result)
-
- @override_config(
- {
- "experimental_features": {"msc3967_enabled": True},
- "ui_auth": {"session_timeout": "15s"},
- }
- )
- def test_device_signing_with_msc3967(self) -> None:
- """Device signing key follows MSC3967 behaviour when enabled."""
password = "wonderland"
device_id = "ABCDEFGHI"
alice_id = self.register_user("alice", password)
|
