summary refs log tree commit diff
path: root/tests/server.py
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-09-04 16:56:29 -0700
committerGitHub <noreply@github.com>2019-09-04 16:56:29 -0700
commit19bb5c80241782dbb257aabb40094c1aa8c22847 (patch)
tree97fdf219de3ed852dfe3e35aebe98a4f1122a9ba /tests/server.py
parentMerge branch 'develop' into uhoreg/e2e_cross-signing_merged (diff)
parentadd user signature stream change cache to slaved device store (diff)
downloadsynapse-19bb5c80241782dbb257aabb40094c1aa8c22847.tar.xz
Merge pull request #5769 from matrix-org/uhoreg/e2e_cross-signing2-part1
Cross-signing [2/4] - upload/download keys
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 c8269619b1..e397ebe8fa 100644 --- a/tests/server.py +++ b/tests/server.py
@@ -338,7 +338,7 @@ def setup_test_homeserver(cleanup_func, *args, **kwargs): def get_clock(): clock = ThreadedMemoryReactorClock() hs_clock = Clock(clock) - return (clock, hs_clock) + return clock, hs_clock @attr.s(cmp=False)