diff options
| author | Erik Johnston <erik@matrix.org> | 2016-01-29 13:52:12 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-01-29 13:52:12 +0000 |
| commit | fd142c29d9af53fe76dcf0cb4e1ebe7aac5d28f2 (patch) | |
| tree | fd4650925097b4014e8ce32619ab4956a0a89879 /tests/storage/test_appservice.py | |
| parent | Bump version and changelog (diff) | |
| parent | Bump AccountDataAndTagsChangeCache size (diff) | |
| download | synapse-fd142c29d9af53fe76dcf0cb4e1ebe7aac5d28f2.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.12.1
Diffstat (limited to 'tests/storage/test_appservice.py')
| -rw-r--r-- | tests/storage/test_appservice.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/storage/test_appservice.py b/tests/storage/test_appservice.py index 5abecdf6e0..ed8af10d87 100644 --- a/tests/storage/test_appservice.py +++ b/tests/storage/test_appservice.py @@ -439,7 +439,7 @@ class ApplicationServiceStoreConfigTestCase(unittest.TestCase): f2 = self._write_config(suffix="2") config = Mock(app_service_config_files=[f1, f2]) - hs = yield setup_test_homeserver(config=config) + hs = yield setup_test_homeserver(config=config, datastore=Mock()) ApplicationServiceStore(hs) @@ -449,7 +449,7 @@ class ApplicationServiceStoreConfigTestCase(unittest.TestCase): f2 = self._write_config(id="id", suffix="2") config = Mock(app_service_config_files=[f1, f2]) - hs = yield setup_test_homeserver(config=config) + hs = yield setup_test_homeserver(config=config, datastore=Mock()) with self.assertRaises(ConfigError) as cm: ApplicationServiceStore(hs) @@ -465,7 +465,7 @@ class ApplicationServiceStoreConfigTestCase(unittest.TestCase): f2 = self._write_config(as_token="as_token", suffix="2") config = Mock(app_service_config_files=[f1, f2]) - hs = yield setup_test_homeserver(config=config) + hs = yield setup_test_homeserver(config=config, datastore=Mock()) with self.assertRaises(ConfigError) as cm: ApplicationServiceStore(hs) |