diff options
| author | David Robertson <davidr@element.io> | 2023-10-24 14:23:19 +0100 |
|---|---|---|
| committer | David Robertson <davidr@element.io> | 2023-10-24 14:23:19 +0100 |
| commit | c0d2f7649e2951ed8a91532adf1f6acceeb0f06f (patch) | |
| tree | 92dfd202e2316fa3bf3f33c47433de651dd0e880 /tests/http | |
| parent | Add test case to detect dodgy b64 encoding (diff) | |
| parent | Rework alias and public room list rules docs (#16541) (diff) | |
| download | synapse-c0d2f7649e2951ed8a91532adf1f6acceeb0f06f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'tests/http')
| -rw-r--r-- | tests/http/server/_base.py | 2 | ||||
| -rw-r--r-- | tests/http/test_matrixfederationclient.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/http/server/_base.py b/tests/http/server/_base.py index 36472e57a8..d524c183f8 100644 --- a/tests/http/server/_base.py +++ b/tests/http/server/_base.py @@ -335,7 +335,7 @@ class Deferred__next__Patch: self._request_number = request_number self._seen_awaits = seen_awaits - self._original_Deferred___next__ = Deferred.__next__ + self._original_Deferred___next__ = Deferred.__next__ # type: ignore[misc,unused-ignore] # The number of `await`s on `Deferred`s we have seen so far. self.awaits_seen = 0 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") |