diff options
author | David Baker <dave@matrix.org> | 2015-01-28 12:51:05 +0000 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2015-01-28 12:51:05 +0000 |
commit | c291a4d522afef7449311673b3863db5e484b6e8 (patch) | |
tree | f69458797cfba50c33448a7953e34f3527158154 /tests/handlers/test_presencelike.py | |
parent | Reset badge count to zero when last active time is bumped (diff) | |
parent | Initial cut of a shared base class for REST unit tests (diff) | |
download | synapse-c291a4d522afef7449311673b3863db5e484b6e8.tar.xz |
Merge branch 'develop' into pushers
Conflicts: synapse/handlers/events.py synapse/server.py
Diffstat (limited to 'tests/handlers/test_presencelike.py')
-rw-r--r-- | tests/handlers/test_presencelike.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/handlers/test_presencelike.py b/tests/handlers/test_presencelike.py index 0584e4c8b9..3cdbb186ae 100644 --- a/tests/handlers/test_presencelike.py +++ b/tests/handlers/test_presencelike.py @@ -27,6 +27,7 @@ from synapse.server import HomeServer from synapse.api.constants import PresenceState from synapse.handlers.presence import PresenceHandler from synapse.handlers.profile import ProfileHandler +from synapse.types import UserID OFFLINE = PresenceState.OFFLINE @@ -136,12 +137,12 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase): lambda u: defer.succeed([])) # Some local users to test with - self.u_apple = hs.parse_userid("@apple:test") - self.u_banana = hs.parse_userid("@banana:test") - self.u_clementine = hs.parse_userid("@clementine:test") + self.u_apple = UserID.from_string("@apple:test") + self.u_banana = UserID.from_string("@banana:test") + self.u_clementine = UserID.from_string("@clementine:test") # Remote user - self.u_potato = hs.parse_userid("@potato:remote") + self.u_potato = UserID.from_string("@potato:remote") self.mock_get_joined = ( self.datastore.get_rooms_for_user_where_membership_is |