diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-06-10 20:28:08 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-06-10 20:28:08 +0100 |
| commit | 69a43d9974824893605252bf32d08484fdaa28fb (patch) | |
| tree | 180a6d2e659269ebf6e61b424051497cbab22848 /tests/__init__.py | |
| parent | SAML2 Improvements and redirect stuff (diff) | |
| parent | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-69a43d9974824893605252bf32d08484fdaa28fb.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/saml2_client
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 |