diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-11-19 16:38:40 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-11-19 16:38:40 +0000 |
| commit | c5eabe3143bc3398961ed80da041f28e545386bf (patch) | |
| tree | df8ab480f1df3ddb2e05cefb741f10ed990d37fc /tests | |
| parent | Preserve logging context in a few more places, drop the logging context after... (diff) | |
| download | synapse-c5eabe3143bc3398961ed80da041f28e545386bf.tar.xz | |
replace user_id with sender
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/federation/test_federation.py | 3 | ||||
| -rw-r--r-- | tests/handlers/test_federation.py | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py index efac4075dc..73dd289276 100644 --- a/tests/federation/test_federation.py +++ b/tests/federation/test_federation.py @@ -100,6 +100,7 @@ class FederationTestCase(unittest.TestCase): make_pdu( event_id="the-pdu-id", origin="red", + user_id="@a:red", room_id="my-context", type="m.topic", origin_server_ts=123456789000, @@ -145,6 +146,7 @@ class FederationTestCase(unittest.TestCase): make_pdu( event_id="abc123def456", origin="red", + user_id="@a:red", room_id="my-context", type="m.text", origin_server_ts=123456789001, @@ -172,6 +174,7 @@ class FederationTestCase(unittest.TestCase): pdu = SynapseEvent( event_id="abc123def456", origin="red", + user_id="@a:red", room_id="my-context", type="m.text", origin_server_ts=123456789001, diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py index e19b073817..3487a090e9 100644 --- a/tests/handlers/test_federation.py +++ b/tests/handlers/test_federation.py @@ -81,8 +81,9 @@ class FederationTestCase(unittest.TestCase): content={"msgtype": u"fooo"}, origin_server_ts=0, event_id="$a:b", + user_id="@a:b", origin="b", - hashes={"sha256":"PvbCLWrTBxnBsSO7/cJ76072ySTCgI/XGadESRAe02M"}, + hashes={"sha256":"AcLrgtUIqqwaGoHhrEvYG1YLDIsVPYJdSRGhkp3jJp8"}, ) self.datastore.persist_event.return_value = defer.succeed(None) |