summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-14 16:44:27 +0100
committerMark Haines <mark.haines@matrix.org>2014-10-14 16:44:27 +0100
commit9aed791fc38790eae6c24e154e7f82ac8509295d (patch)
tree7a819420e36ad06df40b00023827f8021c1f18af /tests
parentremove debugging logging for signing requests (diff)
downloadsynapse-9aed791fc38790eae6c24e154e7f82ac8509295d.tar.xz
SYN-103: Ignore the 'origin' key in received EDUs. Instead take the origin from the transaction itself
Diffstat (limited to 'tests')
-rw-r--r--tests/federation/test_federation.py1
-rw-r--r--tests/handlers/test_presence.py1
-rw-r--r--tests/handlers/test_typing.py1
3 files changed, 3 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", diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index 15022b8d05..84985a8066 100644 --- a/tests/handlers/test_presence.py +++ b/tests/handlers/test_presence.py
@@ -43,6 +43,7 @@ def _expect_edu(destination, edu_type, content, origin="test"): "pdus": [], "edus": [ { + # TODO: SYN-103: Remove "origin" and "destination" keys. "origin": origin, "destination": destination, "edu_type": edu_type, diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py
index 064b04c217..b685373deb 100644 --- a/tests/handlers/test_typing.py +++ b/tests/handlers/test_typing.py
@@ -33,6 +33,7 @@ def _expect_edu(destination, edu_type, content, origin="test"): "pdus": [], "edus": [ { + # TODO: SYN-103: Remove "origin" and "destination" keys. "origin": origin, "destination": destination, "edu_type": edu_type,