|
@@ -55,7 +55,8 @@ class ApplicationServiceStoreTestCase(unittest.TestCase):
|
|
|
self._add_appservice("token2", "as2", "some_url", "some_hs_token", "bob")
|
|
|
self._add_appservice("token3", "as3", "some_url", "some_hs_token", "bob")
|
|
|
# must be done after inserts
|
|
|
- self.store = ApplicationServiceStore(hs.get_db_conn(), hs)
|
|
|
+ database = Database(hs)
|
|
|
+ self.store = ApplicationServiceStore(database, hs.get_db_conn(), hs)
|
|
|
|
|
|
def tearDown(self):
|
|
|
# TODO: suboptimal that we need to create files for tests!
|
|
@@ -124,7 +125,8 @@ class ApplicationServiceTransactionStoreTestCase(unittest.TestCase):
|
|
|
|
|
|
self.as_yaml_files = []
|
|
|
|
|
|
- self.store = TestTransactionStore(hs.get_db_conn(), hs)
|
|
|
+ database = Database(hs)
|
|
|
+ self.store = TestTransactionStore(database, hs.get_db_conn(), hs)
|
|
|
|
|
|
def _add_service(self, url, as_token, id):
|
|
|
as_yaml = dict(
|
|
@@ -417,7 +419,7 @@ class ApplicationServiceStoreConfigTestCase(unittest.TestCase):
|
|
|
hs.config.event_cache_size = 1
|
|
|
hs.config.password_providers = []
|
|
|
|
|
|
- ApplicationServiceStore(hs.get_db_conn(), hs)
|
|
|
+ ApplicationServiceStore(Database(hs), hs.get_db_conn(), hs)
|
|
|
|
|
|
@defer.inlineCallbacks
|
|
|
def test_duplicate_ids(self):
|
|
@@ -433,7 +435,7 @@ class ApplicationServiceStoreConfigTestCase(unittest.TestCase):
|
|
|
hs.config.password_providers = []
|
|
|
|
|
|
with self.assertRaises(ConfigError) as cm:
|
|
|
- ApplicationServiceStore(hs.get_db_conn(), hs)
|
|
|
+ ApplicationServiceStore(Database(hs), hs.get_db_conn(), hs)
|
|
|
|
|
|
e = cm.exception
|
|
|
self.assertIn(f1, str(e))
|
|
@@ -454,7 +456,7 @@ class ApplicationServiceStoreConfigTestCase(unittest.TestCase):
|
|
|
hs.config.password_providers = []
|
|
|
|
|
|
with self.assertRaises(ConfigError) as cm:
|
|
|
- ApplicationServiceStore(hs.get_db_conn(), hs)
|
|
|
+ ApplicationServiceStore(Database(hs), hs.get_db_conn(), hs)
|
|
|
|
|
|
e = cm.exception
|
|
|
self.assertIn(f1, str(e))
|