summary refs log tree commit diff
path: root/tests/unittest.py
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2023-10-16 15:42:54 -0400
committerPatrick Cloke <patrickc@matrix.org>2023-10-16 15:42:54 -0400
commitc1878cd4ae7fec1d7b090b4b45698ce36bcd3726 (patch)
tree2de86373f8b7516a69ac910597a2a514ec41afd5 /tests/unittest.py
parentMerge branch 'develop' into clokep/db-upgrades (diff)
parentUpdate the release script to remind releaser to check for special release not... (diff)
downloadsynapse-c1878cd4ae7fec1d7b090b4b45698ce36bcd3726.tar.xz
Merge remote-tracking branch 'origin/develop' into clokep/db-upgrades
Diffstat (limited to 'tests/unittest.py')
-rw-r--r--tests/unittest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/unittest.py b/tests/unittest.py
index dbaff361b4..99ad02eb06 100644
--- a/tests/unittest.py
+++ b/tests/unittest.py
@@ -60,7 +60,7 @@ from synapse.config.homeserver import HomeServerConfig
 from synapse.config.server import DEFAULT_ROOM_VERSION
 from synapse.crypto.event_signing import add_hashes_and_signatures
 from synapse.federation.transport.server import TransportLayerServer
-from synapse.http.server import JsonResource
+from synapse.http.server import JsonResource, OptionsResource
 from synapse.http.site import SynapseRequest, SynapseSite
 from synapse.logging.context import (
     SENTINEL_CONTEXT,
@@ -459,7 +459,7 @@ class HomeserverTestCase(TestCase):
         The default calls `self.create_resource_dict` and builds the resultant dict
         into a tree.
         """
-        root_resource = Resource()
+        root_resource = OptionsResource()
         create_resource_tree(self.create_resource_dict(), root_resource)
         return root_resource