diff options
| author | Erik Johnston <erik@matrix.org> | 2016-10-11 14:08:29 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-10-11 14:08:29 +0100 |
| commit | 3061dac53eef21110d8d9f08554f28c562175a18 (patch) | |
| tree | 51a8cb5ed3f294887bdcc2d6ef36efcad186af07 /tests/storage/test_appservice.py | |
| parent | Fix check of wrong variable (diff) | |
| parent | Merge pull request #1166 from matrix-org/rav/grandfather_broken_riot_signup (diff) | |
| download | synapse-3061dac53eef21110d8d9f08554f28c562175a18.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/replication_noop
Diffstat (limited to 'tests/storage/test_appservice.py')
| -rw-r--r-- | tests/storage/test_appservice.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/storage/test_appservice.py b/tests/storage/test_appservice.py index 3e2862daae..f3df8302da 100644 --- a/tests/storage/test_appservice.py +++ b/tests/storage/test_appservice.py @@ -71,14 +71,12 @@ class ApplicationServiceStoreTestCase(unittest.TestCase): outfile.write(yaml.dump(as_yaml)) self.as_yaml_files.append(as_token) - @defer.inlineCallbacks def test_retrieve_unknown_service_token(self): - service = yield self.store.get_app_service_by_token("invalid_token") + service = self.store.get_app_service_by_token("invalid_token") self.assertEquals(service, None) - @defer.inlineCallbacks def test_retrieval_of_service(self): - stored_service = yield self.store.get_app_service_by_token( + stored_service = self.store.get_app_service_by_token( self.as_token ) self.assertEquals(stored_service.token, self.as_token) @@ -97,9 +95,8 @@ class ApplicationServiceStoreTestCase(unittest.TestCase): [] ) - @defer.inlineCallbacks def test_retrieval_of_all_services(self): - services = yield self.store.get_app_services() + services = self.store.get_app_services() self.assertEquals(len(services), 3) |