summary refs log tree commit diff
path: root/tests/test_federation.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2018-07-23 19:21:37 +0100
committerMatthew Hodgson <matthew@matrix.org>2018-07-23 19:21:37 +0100
commitadfe29ec0bedf394772e30583c271f142bccd3ba (patch)
treeba4759be562a0f9f9cddc514968fd16e7b0faa90 /tests/test_federation.py
parentincorporate review (diff)
parentMerge pull request #3584 from matrix-org/erikj/use_cached (diff)
downloadsynapse-adfe29ec0bedf394772e30583c271f142bccd3ba.tar.xz
Merge branch 'develop' into matthew/filter_members
Diffstat (limited to 'tests/test_federation.py')
-rw-r--r--tests/test_federation.py3
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()),
                     }
                 )