summary refs log tree commit diff
path: root/tests/replication/_base.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-13 16:10:07 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-13 16:10:07 +0100
commit77866a5f5f9e805ebe599a5dc7d19152b68a0f01 (patch)
treee81016df9807f97c1c8f88b82ad9c73cbaa94586 /tests/replication/_base.py
parentRevert "Patch to temporarily drop cross-user m.key_share_requests (#8675)" (diff)
parentMerge branch 'erikj/fix_stalled_catchup' into matrix-org-hotfixes (diff)
downloadsynapse-77866a5f5f9e805ebe599a5dc7d19152b68a0f01.tar.xz
Merge branch 'matrix-org-hotfixes' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'tests/replication/_base.py')
-rw-r--r--tests/replication/_base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/replication/_base.py b/tests/replication/_base.py

index 67b7913666..1d4a592862 100644 --- a/tests/replication/_base.py +++ b/tests/replication/_base.py
@@ -44,7 +44,7 @@ from tests.server import FakeTransport try: import hiredis except ImportError: - hiredis = None + hiredis = None # type: ignore logger = logging.getLogger(__name__)