summary refs log tree commit diff
path: root/tests/storage/test_presence.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-30 14:09:32 +0000
committerErik Johnston <erik@matrix.org>2015-01-30 14:09:32 +0000
commit2aaedab2033119efb8c22fc2941aa341ea1e9de9 (patch)
tree14fd6e4eda613a51dda6736e2e672add87a2f723 /tests/storage/test_presence.py
parentRemove commented line (diff)
parentWe do need Twisted 14, not 15: we use internal Twisted things that have been ... (diff)
downloadsynapse-2aaedab2033119efb8c22fc2941aa341ea1e9de9.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into new_state_resolution
Diffstat (limited to 'tests/storage/test_presence.py')
-rw-r--r--tests/storage/test_presence.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/storage/test_presence.py b/tests/storage/test_presence.py
index 9655d3cf42..1ab193736b 100644
--- a/tests/storage/test_presence.py
+++ b/tests/storage/test_presence.py
@@ -19,6 +19,7 @@ from twisted.internet import defer
 
 from synapse.server import HomeServer
 from synapse.storage.presence import PresenceStore
+from synapse.types import UserID
 
 from tests.utils import SQLiteMemoryDbPool, MockClock
 
@@ -37,8 +38,8 @@ class PresenceStoreTestCase(unittest.TestCase):
 
         self.store = PresenceStore(hs)
 
-        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")
 
     @defer.inlineCallbacks
     def test_state(self):