diff options
| author | Erik Johnston <erik@matrix.org> | 2015-10-13 13:19:23 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-10-13 13:29:02 +0100 |
| commit | f9340ea0d5346bb07489b1bd03bb90ea8f437e42 (patch) | |
| tree | 3cb14e0a740aa768df674d08bb51c53970a215cb /tests | |
| parent | Search left rooms too (diff) | |
| parent | Expose error more nicely (diff) | |
| download | synapse-f9340ea0d5346bb07489b1bd03bb90ea8f437e42.tar.xz | |
Merge branch 'erikj/store_engine' into erikj/search
Diffstat (limited to 'tests')
| -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 dd19a16fc7..6eb575bd09 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -16,7 +16,7 @@ from synapse.http.server import HttpServer from synapse.api.errors import cs_error, CodeMessageException, StoreError from synapse.api.constants import EventTypes -from synapse.storage import prepare_database +from synapse.storage.schema_prepare import prepare_database from synapse.storage.engines import create_engine from synapse.server import HomeServer |