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/storage/test_redaction.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/storage/test_redaction.py')
-rw-r--r-- | tests/storage/test_redaction.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/storage/test_redaction.py b/tests/storage/test_redaction.py index 9806fbc69b..0713dfab64 100644 --- a/tests/storage/test_redaction.py +++ b/tests/storage/test_redaction.py @@ -19,6 +19,7 @@ from twisted.internet import defer from synapse.server import HomeServer from synapse.api.constants import EventTypes, Membership +from synapse.types import UserID, RoomID from tests.utils import SQLiteMemoryDbPool, MockKey @@ -48,10 +49,10 @@ class RedactionTestCase(unittest.TestCase): self.handlers = hs.get_handlers() self.message_handler = self.handlers.message_handler - self.u_alice = hs.parse_userid("@alice:test") - self.u_bob = hs.parse_userid("@bob:test") + self.u_alice = UserID.from_string("@alice:test") + self.u_bob = UserID.from_string("@bob:test") - self.room1 = hs.parse_roomid("!abc123:test") + self.room1 = RoomID.from_string("!abc123:test") self.depth = 1 |