diff options
| author | Erik Johnston <erikj@jki.re> | 2018-11-02 14:12:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-02 14:12:49 +0000 |
| commit | 90d713b8c6b8763447e31ff02ccfe5ea73a8db50 (patch) | |
| tree | c20a24d265f11bb39e9f941f6050bf6c0479d098 /tests | |
| parent | Fix typing being reset causing infinite syncs (#4127) (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-90d713b8c6b8763447e31ff02ccfe5ea73a8db50.tar.xz | |
Merge pull request #4137 from matrix-org/erikj/clean_up_events
Clean up event accesses and tests
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/replication/slave/storage/test_events.py | 4 | ||||
| -rw-r--r-- | tests/test_federation.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/replication/slave/storage/test_events.py b/tests/replication/slave/storage/test_events.py index 41be5d5a1a..1688a741d1 100644 --- a/tests/replication/slave/storage/test_events.py +++ b/tests/replication/slave/storage/test_events.py @@ -28,8 +28,8 @@ ROOM_ID = "!room:blue" def dict_equals(self, other): - me = encode_canonical_json(self._event_dict) - them = encode_canonical_json(other._event_dict) + me = encode_canonical_json(self.get_pdu_json()) + them = encode_canonical_json(other.get_pdu_json()) return me == them diff --git a/tests/test_federation.py b/tests/test_federation.py index 952a0a7b51..e1a34ccffd 100644 --- a/tests/test_federation.py +++ b/tests/test_federation.py @@ -112,7 +112,7 @@ class MessageAcceptTests(unittest.TestCase): "origin_server_ts": 1, "type": "m.room.message", "origin": "test.serv", - "content": "hewwo?", + "content": {"body": "hewwo?"}, "auth_events": [], "prev_events": [("two:test.serv", {}), (most_recent, {})], } |