summary refs log tree commit diff
path: root/tests/__init__.py
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-06-03 21:28:59 +1000
committerGitHub <noreply@github.com>2019-06-03 21:28:59 +1000
commit2889b055543c8db6bf93eaad7035d0eca1ec2874 (patch)
tree6dde18a9193bb681b5ec014e4ee41b7b85f034c5 /tests/__init__.py
parentMerge pull request #5309 from matrix-org/rav/limit_displayname_length (diff)
downloadsynapse-2889b055543c8db6bf93eaad7035d0eca1ec2874.tar.xz
Unify v1 and v2 REST client APIs (#5226)
Diffstat (limited to 'tests/__init__.py')
-rw-r--r--tests/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/__init__.py b/tests/__init__.py
index d3181f9403..f7fc502f01 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -21,4 +21,4 @@ import tests.patch_inline_callbacks
 # attempt to do the patch before we load any synapse code
 tests.patch_inline_callbacks.do_patch()
 
-util.DEFAULT_TIMEOUT_DURATION = 10
+util.DEFAULT_TIMEOUT_DURATION = 20