diff options
| author | Erik Johnston <erikj@jki.re> | 2016-10-11 11:20:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-11 11:20:54 +0100 |
| commit | a2f2516199dc0c4bb94b26a870da0d6531d57723 (patch) | |
| tree | 3f4ad96f70e2ad39e8881d9f65e0380b547d3582 /tests/storage | |
| parent | Merge pull request #1150 from Rugvip/state_key (diff) | |
| parent | rest/client/v1/register: use the correct requester in createUser (diff) | |
| download | synapse-a2f2516199dc0c4bb94b26a870da0d6531d57723.tar.xz | |
Merge pull request #1157 from Rugvip/nolimit
Remove rate limiting from app service senders and fix get_or_create_user requester
Diffstat (limited to 'tests/storage')
| -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) |