diff options
| author | Erik Johnston <erik@matrix.org> | 2018-11-02 13:44:12 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-11-02 13:44:14 +0000 |
| commit | b86d05a279051b59d711c5a1982474994f302803 (patch) | |
| tree | 9a3f3fe0da409a0181942a418e94efc2760bc397 /tests | |
| parent | Merge pull request #4128 from matrix-org/erikj/state_res_v2_version (diff) | |
| download | synapse-b86d05a279051b59d711c5a1982474994f302803.tar.xz | |
Clean up event accesses and tests
This is in preparation to refactor FrozenEvent to support different event formats for different room versions
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, {})], } |