summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-09-06 15:44:48 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-09-06 15:44:48 +0100
commite35c30ed4bb132cb20132c31cdabaebfce1b69bb (patch)
tree776d059fb31c59bb65b785a95e0f751691005d6e
parentMerge branch 'dinsic' into babolivier/dinsic-3pid-invite (diff)
downloadsynapse-e35c30ed4bb132cb20132c31cdabaebfce1b69bb.tar.xz
Fix bogus conflict resolution
-rw-r--r--tests/rest/client/test_room_access_rules.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/rest/client/test_room_access_rules.py b/tests/rest/client/test_room_access_rules.py

index 8da56c29dd..ab76e0f25a 100644 --- a/tests/rest/client/test_room_access_rules.py +++ b/tests/rest/client/test_room_access_rules.py
@@ -586,6 +586,7 @@ class RoomAccessTestCase(unittest.HomeserverTestCase): body=topic_content, tok=self.tok, expect_code=403, + ) def test_revoke_3pid_invite_direct(self): """Tests that revoking a 3PID invite doesn't cause the room access rules module to