diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-02-02 15:57:59 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-02-02 15:57:59 +0000 |
| commit | c059c9fea5e3ef36cadc136e055284953556c4ed (patch) | |
| tree | 39faa451578ceecc16c92c390a564ebec4fc2373 /tests/storage/test_registration.py | |
| parent | Add basic application_services SQL, and hook up parts of the appservice store... (diff) | |
| parent | Ignore empty strings for display names & room names in notifications (diff) | |
| download | synapse-c059c9fea5e3ef36cadc136e055284953556c4ed.tar.xz | |
Merge branch 'develop' into application-services
Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py
Diffstat (limited to 'tests/storage/test_registration.py')
| -rw-r--r-- | tests/storage/test_registration.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/storage/test_registration.py b/tests/storage/test_registration.py index 84bfde7568..6f8bea2f61 100644 --- a/tests/storage/test_registration.py +++ b/tests/storage/test_registration.py @@ -53,7 +53,10 @@ class RegistrationStoreTestCase(unittest.TestCase): ) self.assertEquals( - {"admin": 0, "device_id": None, "name": self.user_id}, + {"admin": 0, + "device_id": None, + "name": self.user_id, + "token_id": 1}, (yield self.store.get_user_by_token(self.tokens[0])) ) @@ -63,7 +66,10 @@ class RegistrationStoreTestCase(unittest.TestCase): yield self.store.add_access_token_to_user(self.user_id, self.tokens[1]) self.assertEquals( - {"admin": 0, "device_id": None, "name": self.user_id}, + {"admin": 0, + "device_id": None, + "name": self.user_id, + "token_id": 2}, (yield self.store.get_user_by_token(self.tokens[1])) ) |