diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-06-26 22:34:41 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-06-26 22:34:41 +0100 |
| commit | a4daa899ec4cd195fc10936f68df5c78314b366c (patch) | |
| tree | 35e88ff388b0f7652773a79930b732aa04f16bde /tests/storage/test_redaction.py | |
| parent | changelog (diff) | |
| parent | Improve docs on choosing server_name (#5558) (diff) | |
| download | synapse-a4daa899ec4cd195fc10936f68df5c78314b366c.tar.xz | |
Merge branch 'develop' into rav/saml2_client
Diffstat (limited to 'tests/storage/test_redaction.py')
| -rw-r--r-- | tests/storage/test_redaction.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/storage/test_redaction.py b/tests/storage/test_redaction.py index 4823d44dec..732a778fab 100644 --- a/tests/storage/test_redaction.py +++ b/tests/storage/test_redaction.py @@ -82,7 +82,7 @@ class RedactionTestCase(unittest.TestCase): "sender": user.to_string(), "state_key": user.to_string(), "room_id": room.to_string(), - "content": {"body": body, "msgtype": u"message"}, + "content": {"body": body, "msgtype": "message"}, }, ) @@ -118,7 +118,7 @@ class RedactionTestCase(unittest.TestCase): def test_redact(self): yield self.inject_room_member(self.room1, self.u_alice, Membership.JOIN) - msg_event = yield self.inject_message(self.room1, self.u_alice, u"t") + msg_event = yield self.inject_message(self.room1, self.u_alice, "t") # Check event has not been redacted: event = yield self.store.get_event(msg_event.event_id) |