summary refs log tree commit diff
path: root/tests/handlers/test_typing.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-01-23 13:41:55 +0000
committerMark Haines <mjark@negativecurvature.net>2015-01-23 13:41:55 +0000
commitf7cb6042117fd54748ec771337a4b04fe8498ac8 (patch)
tree62fece1cc473923d5bd4e72dac9035ca9e81ea1f /tests/handlers/test_typing.py
parentMerge pull request #31 from matrix-org/client_api_resource (diff)
parentRemove hs.parse_eventid (diff)
downloadsynapse-f7cb6042117fd54748ec771337a4b04fe8498ac8.tar.xz
Merge pull request #32 from matrix-org/remove_parse_id_from_hs
Remove parse id from hs
Diffstat (limited to 'tests/handlers/test_typing.py')
-rw-r--r--tests/handlers/test_typing.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py

index 6a498b23a4..8a7fc028d1 100644 --- a/tests/handlers/test_typing.py +++ b/tests/handlers/test_typing.py
@@ -27,6 +27,7 @@ from synapse.server import HomeServer from synapse.handlers.typing import TypingNotificationHandler from synapse.storage.transactions import DestinationsTable +from synapse.types import UserID def _expect_edu(destination, edu_type, content, origin="test"): @@ -153,11 +154,11 @@ class TypingNotificationsTestCase(unittest.TestCase): self.auth.check_joined_room = check_joined_room # Some local users to test with - self.u_apple = hs.parse_userid("@apple:test") - self.u_banana = hs.parse_userid("@banana:test") + self.u_apple = UserID.from_string("@apple:test") + self.u_banana = UserID.from_string("@banana:test") # Remote user - self.u_onion = hs.parse_userid("@onion:farm") + self.u_onion = UserID.from_string("@onion:farm") @defer.inlineCallbacks def test_started_typing_local(self):