diff options
| author | Erik Johnston <erik@matrix.org> | 2016-01-27 17:25:07 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-01-27 17:33:13 +0000 |
| commit | 0487c9441f1439bd02cb4d107a4fcacfe5dbe75d (patch) | |
| tree | 79a2c5293c0c92df36b8a56fbd9bafe954463dec /tests/utils.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setup (diff) | |
| download | synapse-0487c9441f1439bd02cb4d107a4fcacfe5dbe75d.tar.xz | |
Fix tests
Diffstat (limited to 'tests/utils.py')
| -rw-r--r-- | tests/utils.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py index d75d492cb5..43cc2b30cd 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -60,8 +60,10 @@ def setup_test_homeserver(name="test", datastore=None, config=None, **kargs): name, db_pool=db_pool, config=config, version_string="Synapse/tests", database_engine=create_engine("sqlite3"), + get_db_conn=db_pool.get_db_conn, **kargs ) + hs.setup() else: hs = HomeServer( name, db_pool=None, datastore=datastore, config=config, @@ -280,6 +282,12 @@ class SQLiteMemoryDbPool(ConnectionPool, object): lambda conn: prepare_database(conn, engine) ) + def get_db_conn(self): + conn = self.connect() + engine = create_engine("sqlite3") + prepare_database(conn, engine) + return conn + class MemoryDataStore(object): |