diff options
author | Erik Johnston <erik@matrix.org> | 2015-01-23 15:51:48 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-01-23 15:51:48 +0000 |
commit | 9b1e552b5163aad84a3ae4fd70116d3e782fb443 (patch) | |
tree | 19d827838d10688da26e3fa5503c63b71fd34db0 /tests/handlers/test_typing.py | |
parent | Add storage method have_events (diff) | |
parent | Update .gitignore (diff) | |
download | synapse-9b1e552b5163aad84a3ae4fd70116d3e782fb443.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Diffstat (limited to 'tests/handlers/test_typing.py')
-rw-r--r-- | tests/handlers/test_typing.py | 7 |
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): |