summary refs log tree commit diff
path: root/tests/storage
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-23 13:21:58 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-23 13:21:58 +0000
commitada711504efb4dd25fe1123d38a0b2d196b9890a (patch)
tree73789e6eb42442559a7d1e34385827b7465f580c /tests/storage
parentReplace hs.parse_roomid with RoomID.from_string (diff)
downloadsynapse-ada711504efb4dd25fe1123d38a0b2d196b9890a.tar.xz
Replace hs.parse_roomalias with RoomAlias.from_string
Diffstat (limited to 'tests/storage')
-rw-r--r--tests/storage/test_directory.py4
-rw-r--r--tests/storage/test_room.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/storage/test_directory.py b/tests/storage/test_directory.py
index 1bc6391766..bc9ebf35e2 100644
--- a/tests/storage/test_directory.py
+++ b/tests/storage/test_directory.py
@@ -19,7 +19,7 @@ from twisted.internet import defer
 
 from synapse.server import HomeServer
 from synapse.storage.directory import DirectoryStore
-from synapse.types import RoomID
+from synapse.types import RoomID, RoomAlias
 
 from tests.utils import SQLiteMemoryDbPool
 
@@ -39,7 +39,7 @@ class DirectoryStoreTestCase(unittest.TestCase):
         self.store = DirectoryStore(hs)
 
         self.room = RoomID.from_string("!abcde:test")
-        self.alias = hs.parse_roomalias("#my-room:test")
+        self.alias = RoomAlias.from_string("#my-room:test")
 
     @defer.inlineCallbacks
     def test_room_to_alias(self):
diff --git a/tests/storage/test_room.py b/tests/storage/test_room.py
index baec3a3bb9..71e5d34143 100644
--- a/tests/storage/test_room.py
+++ b/tests/storage/test_room.py
@@ -19,7 +19,7 @@ from twisted.internet import defer
 
 from synapse.server import HomeServer
 from synapse.api.constants import EventTypes
-from synapse.types import UserID, RoomID
+from synapse.types import UserID, RoomID, RoomAlias
 
 from tests.utils import SQLiteMemoryDbPool
 
@@ -40,7 +40,7 @@ class RoomStoreTestCase(unittest.TestCase):
         self.store = hs.get_datastore()
 
         self.room = RoomID.from_string("!abcde:test")
-        self.alias = hs.parse_roomalias("#a-room-name:test")
+        self.alias = RoomAlias.from_string("#a-room-name:test")
         self.u_creator = UserID.from_string("@creator:test")
 
         yield self.store.store_room(self.room.to_string(),