diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-10 13:47:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-10 13:47:50 +0100 |
| commit | 933034e2feaae56640e4bbb7f58c85e4bbf720c9 (patch) | |
| tree | a23b9fa75cfb4c2d754c785a2ef0ab1660d2e6dc /tests/__init__.py | |
| parent | Add domain validation when creating room with list of invitees (#6121) (diff) | |
| parent | Fixup comments (diff) | |
| download | synapse-933034e2feaae56640e4bbb7f58c85e4bbf720c9.tar.xz | |
Merge pull request #6127 from matrix-org/erikj/patch_inner
Add more log context checks when patching inlineCallbacks
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 |