diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-08-30 10:47:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-30 10:47:27 +0100 |
commit | 475253a88e09b505eb1a5977985a9e9e93878b26 (patch) | |
tree | 0798039957eecc0776489a28484021998b88e954 /tests/utils.py | |
parent | Merge pull request #3768 from krombel/fix_3445 (diff) | |
parent | Fix up tests (diff) | |
download | synapse-475253a88e09b505eb1a5977985a9e9e93878b26.tar.xz |
Merge pull request #3764 from matrix-org/rav/close_db_conn_after_init
Make sure that we close db connections opened during init
Diffstat (limited to 'tests/utils.py')
-rw-r--r-- | tests/utils.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/utils.py b/tests/utils.py index e8ef10445c..657c258a6e 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -29,7 +29,7 @@ from synapse.api.errors import CodeMessageException, cs_error from synapse.federation.transport import server from synapse.http.server import HttpServer from synapse.server import HomeServer -from synapse.storage import PostgresEngine +from synapse.storage import DataStore, PostgresEngine from synapse.storage.engines import create_engine from synapse.storage.prepare_database import ( _get_or_create_schema_state, @@ -92,10 +92,14 @@ def setupdb(): atexit.register(_cleanup) +class TestHomeServer(HomeServer): + DATASTORE_CLASS = DataStore + + @defer.inlineCallbacks def setup_test_homeserver( cleanup_func, name="test", datastore=None, config=None, reactor=None, - homeserverToUse=HomeServer, **kargs + homeserverToUse=TestHomeServer, **kargs ): """ Setup a homeserver suitable for running tests against. Keyword arguments |