diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-30 14:08:28 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-30 14:08:28 +0000 |
| commit | e0b7c521cbe4d9aa4403a8e5394177a51c6d5d8f (patch) | |
| tree | f84a3b1845ff2e6df699d69f3fbb99a2c1ed918b /tests/storage/test_redaction.py | |
| parent | Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rej... (diff) | |
| parent | We do need Twisted 14, not 15: we use internal Twisted things that have been ... (diff) | |
| download | synapse-e0b7c521cbe4d9aa4403a8e5394177a51c6d5d8f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage
Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql
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 |