summary refs log tree commit diff
path: root/tests/http/test_matrixfederationclient.py
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2023-10-24 14:23:19 +0100
committerDavid Robertson <davidr@element.io>2023-10-24 14:23:19 +0100
commitc0d2f7649e2951ed8a91532adf1f6acceeb0f06f (patch)
tree92dfd202e2316fa3bf3f33c47433de651dd0e880 /tests/http/test_matrixfederationclient.py
parentAdd test case to detect dodgy b64 encoding (diff)
parentRework alias and public room list rules docs (#16541) (diff)
downloadsynapse-c0d2f7649e2951ed8a91532adf1f6acceeb0f06f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'tests/http/test_matrixfederationclient.py')
-rw-r--r--tests/http/test_matrixfederationclient.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/http/test_matrixfederationclient.py b/tests/http/test_matrixfederationclient.py
index ab94f3f67a..bf1d287699 100644
--- a/tests/http/test_matrixfederationclient.py
+++ b/tests/http/test_matrixfederationclient.py
@@ -70,7 +70,7 @@ class FederationClientTests(HomeserverTestCase):
         """
 
         @defer.inlineCallbacks
-        def do_request() -> Generator["Deferred[object]", object, object]:
+        def do_request() -> Generator["Deferred[Any]", object, object]:
             with LoggingContext("one") as context:
                 fetch_d = defer.ensureDeferred(
                     self.cl.get_json("testserv:8008", "foo/bar")