diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-10-15 11:51:55 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-10-15 11:51:55 +0100 |
| commit | f38df51e8dd8e462871c9bfb8fb49a89d157bf2d (patch) | |
| tree | 08736d0f751f3ee3ee8f0c8f7b1cbce5de5569a7 /tests/utils.py | |
| parent | Use more descriptive error code (diff) | |
| parent | Merge pull request #305 from matrix-org/markjh/v2_sync_api (diff) | |
| download | synapse-f38df51e8dd8e462871c9bfb8fb49a89d157bf2d.tar.xz | |
Merge branch 'develop' into daniel/3pidinvites
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 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 |