diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2019-06-04 01:16:01 +1000 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2019-06-04 01:16:01 +1000 |
| commit | 6f9f08005cd8973418662c716fec7c808e2cd0b2 (patch) | |
| tree | 83af2f021f64c90003b94fce60f839a2bc6192aa /tests/__init__.py | |
| parent | add stuff in bg updates (diff) | |
| parent | Merge pull request #5307 from matrix-org/rav/server_keys/07-fix-notary-cache-... (diff) | |
| download | synapse-6f9f08005cd8973418662c716fec7c808e2cd0b2.tar.xz | |
Merge remote-tracking branch 'origin/develop' into hawkowl/full-schema-v1
Diffstat (limited to 'tests/__init__.py')
| -rw-r--r-- | tests/__init__.py | 2 |
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 |