diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-07-23 17:15:12 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-07-23 17:15:12 +0100 |
commit | 4f5cc8e4e796153cbdc09517e521fc3a23eb66c2 (patch) | |
tree | ccaa25ba8cec666b88ac217f6495cf59663550b0 /tests/test_federation.py | |
parent | Remove redundant checks on room forgottenness (diff) | |
parent | Merge pull request #3582 from matrix-org/erikj/fixup_stateless (diff) | |
download | synapse-4f5cc8e4e796153cbdc09517e521fc3a23eb66c2.tar.xz |
Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_room
Diffstat (limited to 'tests/test_federation.py')
-rw-r--r-- | tests/test_federation.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/test_federation.py b/tests/test_federation.py index 159a136971..f40ff29b52 100644 --- a/tests/test_federation.py +++ b/tests/test_federation.py @@ -137,7 +137,6 @@ class MessageAcceptTests(unittest.TestCase): ) self.assertEqual(self.successResultOf(extrem)[0], "$join:test.serv") - @unittest.DEBUG def test_cant_hide_past_history(self): """ If you send a message, you must be able to provide the direct @@ -178,7 +177,7 @@ class MessageAcceptTests(unittest.TestCase): for x, y in d.items() if x == ("m.room.member", "@us:test") ], - "auth_chain_ids": d.values(), + "auth_chain_ids": list(d.values()), } ) |