diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-10-14 11:40:45 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-10-14 11:40:45 +0100 |
| commit | f50c43464c953b523297f0ecc5acff2c425187eb (patch) | |
| tree | bd9be856b0112260f3f59a204b530825c9f0458a /tests | |
| parent | Add a get_invites_for_user method to the storage to find out the rooms a user... (diff) | |
| parent | Merge pull request #303 from matrix-org/markjh/twisted_debugging (diff) | |
| download | synapse-f50c43464c953b523297f0ecc5acff2c425187eb.tar.xz | |
Merge branch 'develop' into markjh/v2_sync_api
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..4da51291a4 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.prepare_database import prepare_database from synapse.storage.engines import create_engine from synapse.server import HomeServer |