diff options
| author | Amber H. Brown <hawkowl@atleastfornow.net> | 2019-07-05 23:49:13 +1000 |
|---|---|---|
| committer | Amber H. Brown <hawkowl@atleastfornow.net> | 2019-07-05 23:49:13 +1000 |
| commit | a175e608e930d0facf37637876b9824b563d16aa (patch) | |
| tree | 91caa588c913c99f1184063fee871d566859c92d /tests/utils.py | |
| parent | linting (diff) | |
| parent | Make errors about email password resets much clearer (#5616) (diff) | |
| download | synapse-a175e608e930d0facf37637876b9824b563d16aa.tar.xz | |
Merge remote-tracking branch 'origin/develop' into shhs shhs-v1.1.1
Diffstat (limited to 'tests/utils.py')
| -rw-r--r-- | tests/utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/utils.py b/tests/utils.py index da43166f3a..d8e55b0801 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -34,6 +34,7 @@ from synapse.config.homeserver import HomeServerConfig from synapse.config.server import DEFAULT_ROOM_VERSION from synapse.federation.transport import server as federation_server from synapse.http.server import HttpServer +from synapse.logging.context import LoggingContext from synapse.server import HomeServer from synapse.storage import DataStore from synapse.storage.engines import PostgresEngine, create_engine @@ -42,7 +43,6 @@ from synapse.storage.prepare_database import ( _setup_new_database, prepare_database, ) -from synapse.util.logcontext import LoggingContext from synapse.util.ratelimitutils import FederationRateLimiter # set this to True to run the tests against postgres instead of sqlite. |