diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-18 11:39:40 +0100 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-18 11:39:40 +0100 |
| commit | cfc28325a67582f6d4cb44d1c4bd123aad5e4e12 (patch) | |
| tree | da83985788b2b53217d34dc32d60d548625f57ad /tests/__init__.py | |
| parent | add note about database upgrade (diff) | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-cfc28325a67582f6d4cb44d1c4bd123aad5e4e12.tar.xz | |
Merge branch 'develop' into uhoreg/e2e_cross-signing_merged
Diffstat (limited to 'tests/__init__.py')
| -rw-r--r-- | tests/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/__init__.py b/tests/__init__.py index f7fc502f01..ed805db1c2 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -16,9 +16,9 @@ from twisted.trial import util -import tests.patch_inline_callbacks +from synapse.util.patch_inline_callbacks import do_patch # attempt to do the patch before we load any synapse code -tests.patch_inline_callbacks.do_patch() +do_patch() util.DEFAULT_TIMEOUT_DURATION = 20 |