summary refs log tree commit diff
path: root/tests/__init__.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-06-04 09:13:42 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-06-04 09:13:42 +0100
commitaeb226332075964e704006bd6989faa173d63576 (patch)
treec2a1785140a15ba665e04e5b8ec279346411958d /tests/__init__.py
parentChangelog (diff)
parentHawkowl/fix missing auth (#5328) (diff)
downloadsynapse-aeb226332075964e704006bd6989faa173d63576.tar.xz
Merge branch 'develop' into babolivier/port_db_account_validity
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