summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-02-27 15:30:40 +0000
committerGitHub <noreply@github.com>2019-02-27 15:30:40 +0000
commit46b0151524cbc19bfe8091bb88bc29267c965c29 (patch)
tree0669a97dc7b6a5099a7cc9034c762365c7bf30ff /tests
parentMerge pull request #4749 from matrix-org/erikj/replication_connection_backoff (diff)
parentFix unit tests (diff)
downloadsynapse-46b0151524cbc19bfe8091bb88bc29267c965c29.tar.xz
Merge pull request #4757 from matrix-org/erikj/key_api_fed_readae
Move server key queries to federation reader
Diffstat (limited to 'tests')
-rw-r--r--tests/utils.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py

index 2dfcb70a93..e8ab312528 100644 --- a/tests/utils.py +++ b/tests/utils.py
@@ -142,6 +142,9 @@ def default_config(name): config.saml2_enabled = False config.public_baseurl = None config.default_identity_server = None + config.key_refresh_interval = 24 * 60 * 60 * 1000 + config.old_signing_keys = {} + config.tls_fingerprints = [] config.use_frozen_dicts = False @@ -457,6 +460,9 @@ class MockKey(object): def verify(self, message, sig): assert sig == b"\x9a\x87$" + def encode(self): + return b"<fake_encoded_key>" + class MockClock(object): now = 1000