diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-30 14:09:32 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-30 14:09:32 +0000 |
| commit | 2aaedab2033119efb8c22fc2941aa341ea1e9de9 (patch) | |
| tree | 14fd6e4eda613a51dda6736e2e672add87a2f723 /tests/handlers/test_directory.py | |
| parent | Remove commented line (diff) | |
| parent | We do need Twisted 14, not 15: we use internal Twisted things that have been ... (diff) | |
| download | synapse-2aaedab2033119efb8c22fc2941aa341ea1e9de9.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into new_state_resolution
Diffstat (limited to 'tests/handlers/test_directory.py')
| -rw-r--r-- | tests/handlers/test_directory.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/handlers/test_directory.py b/tests/handlers/test_directory.py index 8e164e4be0..22119de46a 100644 --- a/tests/handlers/test_directory.py +++ b/tests/handlers/test_directory.py @@ -21,6 +21,7 @@ from mock import Mock from synapse.server import HomeServer from synapse.handlers.directory import DirectoryHandler +from synapse.types import RoomAlias from tests.utils import SQLiteMemoryDbPool, MockKey @@ -65,9 +66,9 @@ class DirectoryTestCase(unittest.TestCase): self.store = hs.get_datastore() - self.my_room = hs.parse_roomalias("#my-room:test") - self.your_room = hs.parse_roomalias("#your-room:test") - self.remote_room = hs.parse_roomalias("#another:remote") + self.my_room = RoomAlias.from_string("#my-room:test") + self.your_room = RoomAlias.from_string("#your-room:test") + self.remote_room = RoomAlias.from_string("#another:remote") @defer.inlineCallbacks def test_get_local_association(self): |