diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-10 14:38:21 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-10-10 14:38:21 +0100 |
| commit | 9d06fb9cb105b33762a55b1d385da81c84507f71 (patch) | |
| tree | 36e42e7b0b32c3ce7358a022a6fcabef0c39a5a5 /tests/__init__.py | |
| parent | Newsfile (diff) | |
| parent | Merge pull request #6191 from matrix-org/rav/fix_packaging (diff) | |
| download | synapse-9d06fb9cb105b33762a55b1d385da81c84507f71.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/postgres_any
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 |