diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-10-15 13:57:12 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-10-15 13:57:12 +0100 |
commit | 27d0c1ecc21026e9fb231746114b53b83ed0b594 (patch) | |
tree | e32b0781ff4ff7d46b3cf25f2f2715aa9248cc16 /tests/federation/test_federation.py | |
parent | Storage for pdu signatures (diff) | |
parent | SYN-103: Ignore the 'origin' key in received EDUs. Instead take the origin fr... (diff) | |
download | synapse-27d0c1ecc21026e9fb231746114b53b83ed0b594.tar.xz |
Merge branch 'develop' into event_signing
Diffstat (limited to 'tests/federation/test_federation.py')
-rw-r--r-- | tests/federation/test_federation.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py index 8d277d6612..d86ce83b28 100644 --- a/tests/federation/test_federation.py +++ b/tests/federation/test_federation.py @@ -211,6 +211,7 @@ class FederationTestCase(unittest.TestCase): "pdus": [], "edus": [ { + # TODO: SYN-103: Remove "origin" and "destination" "origin": "test", "destination": "remote", "edu_type": "m.test", |