diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-12-04 11:30:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-04 11:30:32 +0100 |
| commit | 48972ce9d10c67b49a0f7b4f45aa91551de0c830 (patch) | |
| tree | 787f641e50f195a19b131278e8d9d8ec5984c8c1 /tests/__init__.py | |
| parent | Merge pull request #4250 from matrix-org/hawkowl/pusher-remove-py3 (diff) | |
| download | synapse-48972ce9d10c67b49a0f7b4f45aa91551de0c830.tar.xz | |
Patch defer.inlineCallbacks to check logcontexts in tests (#4205)
Diffstat (limited to 'tests/__init__.py')
| -rw-r--r-- | tests/__init__.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/__init__.py b/tests/__init__.py index 9d9ca22829..d3181f9403 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # Copyright 2014-2016 OpenMarket Ltd +# Copyright 2018 New Vector Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,7 +16,9 @@ from twisted.trial import util -from tests import utils +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 -utils.setupdb() |