summary refs log tree commit diff
path: root/tests/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-03-09 15:23:55 +0000
committerRichard van der Hoff <richard@matrix.org>2021-03-09 15:23:55 +0000
commit56c0c711c169548a2a4cf4e1948a76f7974ec4f8 (patch)
treeb8e625040829cea105d37556b11aa1598828e107 /tests/server.py
parentMerge remote-tracking branch 'origin/release-v1.29.0' into matrix-org-hotfixes (diff)
parentLink to the List user's media admin API from media Admin API docs (#9571) (diff)
downloadsynapse-56c0c711c169548a2a4cf4e1948a76f7974ec4f8.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'tests/server.py')
-rw-r--r--tests/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/server.py b/tests/server.py

index 939a0008ca..863f6da738 100644 --- a/tests/server.py +++ b/tests/server.py
@@ -188,7 +188,7 @@ class FakeSite: def make_request( reactor, - site: Site, + site: Union[Site, FakeSite], method, path, content=b"",