diff options
| author | Erik Johnston <erik@matrix.org> | 2016-04-06 14:08:18 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-04-06 14:15:45 +0100 |
| commit | 8aab9d87fa6739345810f0edf3982fe7f898ee30 (patch) | |
| tree | 8ef3d62989c3014732b8efcaafddfc9c43c36b77 /tests | |
| parent | Merge pull request #692 from matrix-org/markjh/replicate_reshuffle (diff) | |
| download | synapse-8aab9d87fa6739345810f0edf3982fe7f898ee30.tar.xz | |
Don't require config to create database
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/storage/test_base.py | 2 | ||||
| -rw-r--r-- | tests/utils.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/storage/test_base.py b/tests/storage/test_base.py index 2e33beb07c..afbefb2e2d 100644 --- a/tests/storage/test_base.py +++ b/tests/storage/test_base.py @@ -53,7 +53,7 @@ class SQLBaseStoreTestCase(unittest.TestCase): "test", db_pool=self.db_pool, config=config, - database_engine=create_engine(config), + database_engine=create_engine(config.database_config), ) self.datastore = SQLBaseStore(hs) diff --git a/tests/utils.py b/tests/utils.py index 52405502e9..c179df31ee 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -64,7 +64,7 @@ def setup_test_homeserver(name="test", datastore=None, config=None, **kargs): hs = HomeServer( name, db_pool=db_pool, config=config, version_string="Synapse/tests", - database_engine=create_engine(config), + database_engine=create_engine(config.database_config), get_db_conn=db_pool.get_db_conn, **kargs ) @@ -73,7 +73,7 @@ def setup_test_homeserver(name="test", datastore=None, config=None, **kargs): hs = HomeServer( name, db_pool=None, datastore=datastore, config=config, version_string="Synapse/tests", - database_engine=create_engine(config), + database_engine=create_engine(config.database_config), **kargs ) @@ -298,7 +298,7 @@ class SQLiteMemoryDbPool(ConnectionPool, object): return conn def create_engine(self): - return create_engine(self.config) + return create_engine(self.config.database_config) class MemoryDataStore(object): |