summaryrefslogtreecommitdiff
path: root/tests/storage/test_appservice.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@matrix.org>2016-12-16 10:43:39 +0000
committerErik Johnston <erikj@matrix.org>2016-12-16 10:43:39 +0000
commite25685dbda5a91922a7ecee0dce89db1ea1662a9 (patch)
treefce7147d9b4422f76b5cec8b53312bb34932d84f /tests/storage/test_appservice.py
parent4217a384316b04d4c2eed7814ca4defb62af8703 (diff)
Imported Upstream version 0.18.5
Diffstat (limited to 'tests/storage/test_appservice.py')
-rw-r--r--tests/storage/test_appservice.py22
1 files changed, 17 insertions, 5 deletions
diff --git a/tests/storage/test_appservice.py b/tests/storage/test_appservice.py
index 02a67b73..9ff1abcd 100644
--- a/tests/storage/test_appservice.py
+++ b/tests/storage/test_appservice.py
@@ -39,7 +39,7 @@ class ApplicationServiceStoreTestCase(unittest.TestCase):
event_cache_size=1,
password_providers=[],
)
- hs = yield setup_test_homeserver(config=config)
+ hs = yield setup_test_homeserver(config=config, federation_sender=Mock())
self.as_token = "token1"
self.as_url = "some_url"
@@ -112,7 +112,7 @@ class ApplicationServiceTransactionStoreTestCase(unittest.TestCase):
event_cache_size=1,
password_providers=[],
)
- hs = yield setup_test_homeserver(config=config)
+ hs = yield setup_test_homeserver(config=config, federation_sender=Mock())
self.db_pool = hs.get_db_pool()
self.as_list = [
@@ -443,7 +443,11 @@ class ApplicationServiceStoreConfigTestCase(unittest.TestCase):
app_service_config_files=[f1, f2], event_cache_size=1,
password_providers=[]
)
- hs = yield setup_test_homeserver(config=config, datastore=Mock())
+ hs = yield setup_test_homeserver(
+ config=config,
+ datastore=Mock(),
+ federation_sender=Mock()
+ )
ApplicationServiceStore(hs)
@@ -456,7 +460,11 @@ class ApplicationServiceStoreConfigTestCase(unittest.TestCase):
app_service_config_files=[f1, f2], event_cache_size=1,
password_providers=[]
)
- hs = yield setup_test_homeserver(config=config, datastore=Mock())
+ hs = yield setup_test_homeserver(
+ config=config,
+ datastore=Mock(),
+ federation_sender=Mock()
+ )
with self.assertRaises(ConfigError) as cm:
ApplicationServiceStore(hs)
@@ -475,7 +483,11 @@ class ApplicationServiceStoreConfigTestCase(unittest.TestCase):
app_service_config_files=[f1, f2], event_cache_size=1,
password_providers=[]
)
- hs = yield setup_test_homeserver(config=config, datastore=Mock())
+ hs = yield setup_test_homeserver(
+ config=config,
+ datastore=Mock(),
+ federation_sender=Mock()
+ )
with self.assertRaises(ConfigError) as cm:
ApplicationServiceStore(hs)