diff options
author | Mark Haines <mjark@negativecurvature.net> | 2015-01-23 13:41:55 +0000 |
---|---|---|
committer | Mark Haines <mjark@negativecurvature.net> | 2015-01-23 13:41:55 +0000 |
commit | f7cb6042117fd54748ec771337a4b04fe8498ac8 (patch) | |
tree | 62fece1cc473923d5bd4e72dac9035ca9e81ea1f /tests/storage/test_roommember.py | |
parent | Merge pull request #31 from matrix-org/client_api_resource (diff) | |
parent | Remove hs.parse_eventid (diff) | |
download | synapse-f7cb6042117fd54748ec771337a4b04fe8498ac8.tar.xz |
Merge pull request #32 from matrix-org/remove_parse_id_from_hs
Remove parse id from hs
Diffstat (limited to 'tests/storage/test_roommember.py')
-rw-r--r-- | tests/storage/test_roommember.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/storage/test_roommember.py b/tests/storage/test_roommember.py index a23a8189df..2b9048e2a9 100644 --- a/tests/storage/test_roommember.py +++ b/tests/storage/test_roommember.py @@ -19,6 +19,7 @@ from twisted.internet import defer from synapse.server import HomeServer from synapse.api.constants import EventTypes, Membership +from synapse.types import UserID, RoomID from tests.utils import SQLiteMemoryDbPool, MockKey @@ -49,13 +50,13 @@ class RoomMemberStoreTestCase(unittest.TestCase): self.handlers = hs.get_handlers() self.message_handler = self.handlers.message_handler - self.u_alice = hs.parse_userid("@alice:test") - self.u_bob = hs.parse_userid("@bob:test") + self.u_alice = UserID.from_string("@alice:test") + self.u_bob = UserID.from_string("@bob:test") # User elsewhere on another host - self.u_charlie = hs.parse_userid("@charlie:elsewhere") + self.u_charlie = UserID.from_string("@charlie:elsewhere") - self.room = hs.parse_roomid("!abc123:test") + self.room = RoomID.from_string("!abc123:test") @defer.inlineCallbacks def inject_room_member(self, room, user, membership, replaces_state=None): |