diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-27 09:17:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-27 09:17:11 +0100 |
| commit | 7041cd872b8f1105d58f8e8ac79ffd32c76a1994 (patch) | |
| tree | 4736db867cfd029d8e7627edb971eccc926371bc /tests/test_federation.py | |
| parent | Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_... (diff) | |
| parent | Merge pull request #3616 from matrix-org/travis/event_id_send_leave (diff) | |
| download | synapse-7041cd872b8f1105d58f8e8ac79ffd32c76a1994.tar.xz | |
Merge branch 'develop' into send_sni_for_federation_requests
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()), } ) |