mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-08-14 04:55:22 -04:00
Replace assertEquals and friends with non-deprecated versions. (#12092)
This commit is contained in:
Patrick Cloke
GitHub
parent
ab3ef49059
commit
02d708568b
62 changed files with 888 additions and 889 deletions
|
|
@ -69,7 +69,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
|
||||
channel = self._send_relation(RelationTypes.ANNOTATION, "m.reaction", key="👍")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
event_id = channel.json_body["event_id"]
|
||||
|
||||
|
|
@ -78,7 +78,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
"/rooms/%s/event/%s" % (self.room, event_id),
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
self.assert_dict(
|
||||
{
|
||||
|
|
@ -103,7 +103,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
parent_id="foo",
|
||||
content={"body": "foo", "msgtype": "m.text"},
|
||||
)
|
||||
self.assertEquals(400, channel.code, channel.json_body)
|
||||
self.assertEqual(400, channel.code, channel.json_body)
|
||||
|
||||
# Unless that event is referenced from another event!
|
||||
self.get_success(
|
||||
|
|
@ -123,7 +123,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
parent_id="foo",
|
||||
content={"body": "foo", "msgtype": "m.text"},
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
def test_deny_invalid_room(self):
|
||||
"""Test that we deny relations on non-existant events"""
|
||||
|
|
@ -136,15 +136,15 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
channel = self._send_relation(
|
||||
RelationTypes.ANNOTATION, "m.reaction", parent_id=parent_id, key="A"
|
||||
)
|
||||
self.assertEquals(400, channel.code, channel.json_body)
|
||||
self.assertEqual(400, channel.code, channel.json_body)
|
||||
|
||||
def test_deny_double_react(self):
|
||||
"""Test that we deny relations on membership events"""
|
||||
channel = self._send_relation(RelationTypes.ANNOTATION, "m.reaction", key="a")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
channel = self._send_relation(RelationTypes.ANNOTATION, "m.reaction", "a")
|
||||
self.assertEquals(400, channel.code, channel.json_body)
|
||||
self.assertEqual(400, channel.code, channel.json_body)
|
||||
|
||||
def test_deny_forked_thread(self):
|
||||
"""It is invalid to start a thread off a thread."""
|
||||
|
|
@ -154,7 +154,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
content={"msgtype": "m.text", "body": "foo"},
|
||||
parent_id=self.parent_id,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
parent_id = channel.json_body["event_id"]
|
||||
|
||||
channel = self._send_relation(
|
||||
|
|
@ -163,16 +163,16 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
content={"msgtype": "m.text", "body": "foo"},
|
||||
parent_id=parent_id,
|
||||
)
|
||||
self.assertEquals(400, channel.code, channel.json_body)
|
||||
self.assertEqual(400, channel.code, channel.json_body)
|
||||
|
||||
def test_basic_paginate_relations(self):
|
||||
"""Tests that calling pagination API correctly the latest relations."""
|
||||
channel = self._send_relation(RelationTypes.ANNOTATION, "m.reaction", "a")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
first_annotation_id = channel.json_body["event_id"]
|
||||
|
||||
channel = self._send_relation(RelationTypes.ANNOTATION, "m.reaction", "b")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
second_annotation_id = channel.json_body["event_id"]
|
||||
|
||||
channel = self.make_request(
|
||||
|
|
@ -180,11 +180,11 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/_matrix/client/unstable/rooms/{self.room}/relations/{self.parent_id}?limit=1",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
# We expect to get back a single pagination result, which is the latest
|
||||
# full relation event we sent above.
|
||||
self.assertEquals(len(channel.json_body["chunk"]), 1, channel.json_body)
|
||||
self.assertEqual(len(channel.json_body["chunk"]), 1, channel.json_body)
|
||||
self.assert_dict(
|
||||
{
|
||||
"event_id": second_annotation_id,
|
||||
|
|
@ -195,7 +195,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
)
|
||||
|
||||
# We also expect to get the original event (the id of which is self.parent_id)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
channel.json_body["original_event"]["event_id"], self.parent_id
|
||||
)
|
||||
|
||||
|
|
@ -212,11 +212,11 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/{self.parent_id}?limit=1&org.matrix.msc3715.dir=f",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
# We expect to get back a single pagination result, which is the earliest
|
||||
# full relation event we sent above.
|
||||
self.assertEquals(len(channel.json_body["chunk"]), 1, channel.json_body)
|
||||
self.assertEqual(len(channel.json_body["chunk"]), 1, channel.json_body)
|
||||
self.assert_dict(
|
||||
{
|
||||
"event_id": first_annotation_id,
|
||||
|
|
@ -245,7 +245,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
channel = self._send_relation(
|
||||
RelationTypes.ANNOTATION, "m.reaction", chr(ord("a") + idx)
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
expected_event_ids.append(channel.json_body["event_id"])
|
||||
|
||||
prev_token = ""
|
||||
|
|
@ -260,12 +260,12 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/_matrix/client/unstable/rooms/{self.room}/relations/{self.parent_id}?limit=1{from_token}",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
found_event_ids.extend(e["event_id"] for e in channel.json_body["chunk"])
|
||||
next_batch = channel.json_body.get("next_batch")
|
||||
|
||||
self.assertNotEquals(prev_token, next_batch)
|
||||
self.assertNotEqual(prev_token, next_batch)
|
||||
prev_token = next_batch
|
||||
|
||||
if not prev_token:
|
||||
|
|
@ -273,7 +273,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# We paginated backwards, so reverse
|
||||
found_event_ids.reverse()
|
||||
self.assertEquals(found_event_ids, expected_event_ids)
|
||||
self.assertEqual(found_event_ids, expected_event_ids)
|
||||
|
||||
# Reset and try again, but convert the tokens to the legacy format.
|
||||
prev_token = ""
|
||||
|
|
@ -288,12 +288,12 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/_matrix/client/unstable/rooms/{self.room}/relations/{self.parent_id}?limit=1{from_token}",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
found_event_ids.extend(e["event_id"] for e in channel.json_body["chunk"])
|
||||
next_batch = channel.json_body.get("next_batch")
|
||||
|
||||
self.assertNotEquals(prev_token, next_batch)
|
||||
self.assertNotEqual(prev_token, next_batch)
|
||||
prev_token = next_batch
|
||||
|
||||
if not prev_token:
|
||||
|
|
@ -301,12 +301,12 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# We paginated backwards, so reverse
|
||||
found_event_ids.reverse()
|
||||
self.assertEquals(found_event_ids, expected_event_ids)
|
||||
self.assertEqual(found_event_ids, expected_event_ids)
|
||||
|
||||
def test_pagination_from_sync_and_messages(self):
|
||||
"""Pagination tokens from /sync and /messages can be used to paginate /relations."""
|
||||
channel = self._send_relation(RelationTypes.ANNOTATION, "m.reaction", "A")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
annotation_id = channel.json_body["event_id"]
|
||||
# Send an event after the relation events.
|
||||
self.helper.send(self.room, body="Latest event", tok=self.user_token)
|
||||
|
|
@ -319,7 +319,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
channel = self.make_request(
|
||||
"GET", f"/sync?filter={filter}", access_token=self.user_token
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
room_timeline = channel.json_body["rooms"]["join"][self.room]["timeline"]
|
||||
sync_prev_batch = room_timeline["prev_batch"]
|
||||
self.assertIsNotNone(sync_prev_batch)
|
||||
|
|
@ -335,7 +335,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/rooms/{self.room}/messages?dir=b&limit=1",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
messages_end = channel.json_body["end"]
|
||||
self.assertIsNotNone(messages_end)
|
||||
# Ensure the relation event is not in the chunk returned from /messages.
|
||||
|
|
@ -355,7 +355,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/_matrix/client/unstable/rooms/{self.room}/relations/{self.parent_id}?from={from_token}",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
# The relation should be in the returned chunk.
|
||||
self.assertIn(
|
||||
|
|
@ -386,7 +386,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
key=key,
|
||||
access_token=access_tokens[idx],
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
idx += 1
|
||||
idx %= len(access_tokens)
|
||||
|
|
@ -404,7 +404,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
% (self.room, self.parent_id, from_token),
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
self.assertEqual(len(channel.json_body["chunk"]), 1, channel.json_body)
|
||||
|
||||
|
|
@ -419,13 +419,13 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
next_batch = channel.json_body.get("next_batch")
|
||||
|
||||
self.assertNotEquals(prev_token, next_batch)
|
||||
self.assertNotEqual(prev_token, next_batch)
|
||||
prev_token = next_batch
|
||||
|
||||
if not prev_token:
|
||||
break
|
||||
|
||||
self.assertEquals(sent_groups, found_groups)
|
||||
self.assertEqual(sent_groups, found_groups)
|
||||
|
||||
def test_aggregation_pagination_within_group(self):
|
||||
"""Test that we can paginate within an annotation group."""
|
||||
|
|
@ -449,14 +449,14 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
key="👍",
|
||||
access_token=access_tokens[idx],
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
expected_event_ids.append(channel.json_body["event_id"])
|
||||
|
||||
idx += 1
|
||||
|
||||
# Also send a different type of reaction so that we test we don't see it
|
||||
channel = self._send_relation(RelationTypes.ANNOTATION, "m.reaction", key="a")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
prev_token = ""
|
||||
found_event_ids: List[str] = []
|
||||
|
|
@ -473,7 +473,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/m.reaction/{encoded_key}?limit=1{from_token}",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
self.assertEqual(len(channel.json_body["chunk"]), 1, channel.json_body)
|
||||
|
||||
|
|
@ -481,7 +481,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
next_batch = channel.json_body.get("next_batch")
|
||||
|
||||
self.assertNotEquals(prev_token, next_batch)
|
||||
self.assertNotEqual(prev_token, next_batch)
|
||||
prev_token = next_batch
|
||||
|
||||
if not prev_token:
|
||||
|
|
@ -489,7 +489,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# We paginated backwards, so reverse
|
||||
found_event_ids.reverse()
|
||||
self.assertEquals(found_event_ids, expected_event_ids)
|
||||
self.assertEqual(found_event_ids, expected_event_ids)
|
||||
|
||||
# Reset and try again, but convert the tokens to the legacy format.
|
||||
prev_token = ""
|
||||
|
|
@ -506,7 +506,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/m.reaction/{encoded_key}?limit=1{from_token}",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
self.assertEqual(len(channel.json_body["chunk"]), 1, channel.json_body)
|
||||
|
||||
|
|
@ -514,7 +514,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
next_batch = channel.json_body.get("next_batch")
|
||||
|
||||
self.assertNotEquals(prev_token, next_batch)
|
||||
self.assertNotEqual(prev_token, next_batch)
|
||||
prev_token = next_batch
|
||||
|
||||
if not prev_token:
|
||||
|
|
@ -522,21 +522,21 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# We paginated backwards, so reverse
|
||||
found_event_ids.reverse()
|
||||
self.assertEquals(found_event_ids, expected_event_ids)
|
||||
self.assertEqual(found_event_ids, expected_event_ids)
|
||||
|
||||
def test_aggregation(self):
|
||||
"""Test that annotations get correctly aggregated."""
|
||||
|
||||
channel = self._send_relation(RelationTypes.ANNOTATION, "m.reaction", "a")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
channel = self._send_relation(
|
||||
RelationTypes.ANNOTATION, "m.reaction", "a", access_token=self.user2_token
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
channel = self._send_relation(RelationTypes.ANNOTATION, "m.reaction", "b")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
|
|
@ -544,9 +544,9 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
% (self.room, self.parent_id),
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
channel.json_body,
|
||||
{
|
||||
"chunk": [
|
||||
|
|
@ -560,13 +560,13 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
"""Test that annotations get correctly aggregated after a redaction."""
|
||||
|
||||
channel = self._send_relation(RelationTypes.ANNOTATION, "m.reaction", "a")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
to_redact_event_id = channel.json_body["event_id"]
|
||||
|
||||
channel = self._send_relation(
|
||||
RelationTypes.ANNOTATION, "m.reaction", "a", access_token=self.user2_token
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
# Now lets redact one of the 'a' reactions
|
||||
channel = self.make_request(
|
||||
|
|
@ -575,7 +575,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
access_token=self.user_token,
|
||||
content={},
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
|
|
@ -583,9 +583,9 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
% (self.room, self.parent_id),
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
channel.json_body,
|
||||
{"chunk": [{"type": "m.reaction", "key": "a", "count": 1}]},
|
||||
)
|
||||
|
|
@ -599,7 +599,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
% (self.room, self.parent_id, RelationTypes.REPLACE),
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(400, channel.code, channel.json_body)
|
||||
self.assertEqual(400, channel.code, channel.json_body)
|
||||
|
||||
@unittest.override_config(
|
||||
{"experimental_features": {"msc3440_enabled": True, "msc3666_enabled": True}}
|
||||
|
|
@ -615,29 +615,29 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
"""
|
||||
# Setup by sending a variety of relations.
|
||||
channel = self._send_relation(RelationTypes.ANNOTATION, "m.reaction", "a")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
channel = self._send_relation(
|
||||
RelationTypes.ANNOTATION, "m.reaction", "a", access_token=self.user2_token
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
channel = self._send_relation(RelationTypes.ANNOTATION, "m.reaction", "b")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
channel = self._send_relation(RelationTypes.REFERENCE, "m.room.test")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
reply_1 = channel.json_body["event_id"]
|
||||
|
||||
channel = self._send_relation(RelationTypes.REFERENCE, "m.room.test")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
reply_2 = channel.json_body["event_id"]
|
||||
|
||||
channel = self._send_relation(RelationTypes.THREAD, "m.room.test")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
channel = self._send_relation(RelationTypes.THREAD, "m.room.test")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
thread_2 = channel.json_body["event_id"]
|
||||
|
||||
def assert_bundle(event_json: JsonDict) -> None:
|
||||
|
|
@ -655,7 +655,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
)
|
||||
|
||||
# Check the values of each field.
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
{
|
||||
"chunk": [
|
||||
{"type": "m.reaction", "key": "a", "count": 2},
|
||||
|
|
@ -665,12 +665,12 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
relations_dict[RelationTypes.ANNOTATION],
|
||||
)
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
{"chunk": [{"event_id": reply_1}, {"event_id": reply_2}]},
|
||||
relations_dict[RelationTypes.REFERENCE],
|
||||
)
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
2,
|
||||
relations_dict[RelationTypes.THREAD].get("count"),
|
||||
)
|
||||
|
|
@ -701,7 +701,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/rooms/{self.room}/event/{self.parent_id}",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
assert_bundle(channel.json_body)
|
||||
|
||||
# Request the room messages.
|
||||
|
|
@ -710,7 +710,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/rooms/{self.room}/messages?dir=b",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
assert_bundle(self._find_event_in_chunk(channel.json_body["chunk"]))
|
||||
|
||||
# Request the room context.
|
||||
|
|
@ -719,12 +719,12 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/rooms/{self.room}/context/{self.parent_id}",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
assert_bundle(channel.json_body["event"])
|
||||
|
||||
# Request sync.
|
||||
channel = self.make_request("GET", "/sync", access_token=self.user_token)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
room_timeline = channel.json_body["rooms"]["join"][self.room]["timeline"]
|
||||
self.assertTrue(room_timeline["limited"])
|
||||
assert_bundle(self._find_event_in_chunk(room_timeline["events"]))
|
||||
|
|
@ -737,7 +737,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
content={"search_categories": {"room_events": {"search_term": "Hi"}}},
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
chunk = [
|
||||
result["result"]
|
||||
for result in channel.json_body["search_categories"]["room_events"][
|
||||
|
|
@ -751,42 +751,42 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
when directly requested.
|
||||
"""
|
||||
channel = self._send_relation(RelationTypes.ANNOTATION, "m.reaction", "a")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
annotation_id = channel.json_body["event_id"]
|
||||
|
||||
# Annotate the annotation.
|
||||
channel = self._send_relation(
|
||||
RelationTypes.ANNOTATION, "m.reaction", "a", parent_id=annotation_id
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
f"/rooms/{self.room}/event/{annotation_id}",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
self.assertIsNone(channel.json_body["unsigned"].get("m.relations"))
|
||||
|
||||
def test_aggregation_get_event_for_thread(self):
|
||||
"""Test that threads get bundled aggregations included when directly requested."""
|
||||
channel = self._send_relation(RelationTypes.THREAD, "m.room.test")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
thread_id = channel.json_body["event_id"]
|
||||
|
||||
# Annotate the annotation.
|
||||
channel = self._send_relation(
|
||||
RelationTypes.ANNOTATION, "m.reaction", "a", parent_id=thread_id
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
f"/rooms/{self.room}/event/{thread_id}",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEquals(
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
self.assertEqual(
|
||||
channel.json_body["unsigned"].get("m.relations"),
|
||||
{
|
||||
RelationTypes.ANNOTATION: {
|
||||
|
|
@ -801,11 +801,11 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/_matrix/client/unstable/rooms/{self.room}/relations/{self.parent_id}?limit=1",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
self.assertEqual(len(channel.json_body["chunk"]), 1)
|
||||
|
||||
thread_message = channel.json_body["chunk"][0]
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
thread_message["unsigned"].get("m.relations"),
|
||||
{
|
||||
RelationTypes.ANNOTATION: {
|
||||
|
|
@ -905,7 +905,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/_matrix/client/unstable/rooms/{room2}/relations/{parent_id}",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
self.assertEqual(channel.json_body["chunk"], [])
|
||||
|
||||
# And when fetching aggregations.
|
||||
|
|
@ -914,7 +914,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/_matrix/client/unstable/rooms/{room2}/aggregations/{parent_id}",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
self.assertEqual(channel.json_body["chunk"], [])
|
||||
|
||||
# And for bundled aggregations.
|
||||
|
|
@ -923,7 +923,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/rooms/{room2}/event/{parent_id}",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
self.assertNotIn("m.relations", channel.json_body["unsigned"])
|
||||
|
||||
@unittest.override_config({"experimental_features": {"msc3666_enabled": True}})
|
||||
|
|
@ -936,7 +936,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
"m.room.message",
|
||||
content={"msgtype": "m.text", "body": "foo", "m.new_content": new_body},
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
edit_event_id = channel.json_body["event_id"]
|
||||
|
||||
|
|
@ -958,8 +958,8 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/rooms/{self.room}/event/{self.parent_id}",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEquals(channel.json_body["content"], new_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
self.assertEqual(channel.json_body["content"], new_body)
|
||||
assert_bundle(channel.json_body)
|
||||
|
||||
# Request the room messages.
|
||||
|
|
@ -968,7 +968,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/rooms/{self.room}/messages?dir=b",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
assert_bundle(self._find_event_in_chunk(channel.json_body["chunk"]))
|
||||
|
||||
# Request the room context.
|
||||
|
|
@ -977,7 +977,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/rooms/{self.room}/context/{self.parent_id}",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
assert_bundle(channel.json_body["event"])
|
||||
|
||||
# Request sync, but limit the timeline so it becomes limited (and includes
|
||||
|
|
@ -988,7 +988,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
channel = self.make_request(
|
||||
"GET", f"/sync?filter={filter}", access_token=self.user_token
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
room_timeline = channel.json_body["rooms"]["join"][self.room]["timeline"]
|
||||
self.assertTrue(room_timeline["limited"])
|
||||
assert_bundle(self._find_event_in_chunk(room_timeline["events"]))
|
||||
|
|
@ -1001,7 +1001,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
content={"search_categories": {"room_events": {"search_term": "Hi"}}},
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
chunk = [
|
||||
result["result"]
|
||||
for result in channel.json_body["search_categories"]["room_events"][
|
||||
|
|
@ -1024,7 +1024,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
"m.new_content": {"msgtype": "m.text", "body": "First edit"},
|
||||
},
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
new_body = {"msgtype": "m.text", "body": "I've been edited!"}
|
||||
channel = self._send_relation(
|
||||
|
|
@ -1032,7 +1032,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
"m.room.message",
|
||||
content={"msgtype": "m.text", "body": "foo", "m.new_content": new_body},
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
edit_event_id = channel.json_body["event_id"]
|
||||
|
||||
|
|
@ -1045,16 +1045,16 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
"m.new_content": {"msgtype": "m.text", "body": "Edit, but wrong type"},
|
||||
},
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
channel = self.make_request(
|
||||
"GET",
|
||||
"/rooms/%s/event/%s" % (self.room, self.parent_id),
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
self.assertEquals(channel.json_body["content"], new_body)
|
||||
self.assertEqual(channel.json_body["content"], new_body)
|
||||
|
||||
relations_dict = channel.json_body["unsigned"].get("m.relations")
|
||||
self.assertIn(RelationTypes.REPLACE, relations_dict)
|
||||
|
|
@ -1076,7 +1076,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
"m.room.message",
|
||||
content={"msgtype": "m.text", "body": "A reply!"},
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
reply = channel.json_body["event_id"]
|
||||
|
||||
new_body = {"msgtype": "m.text", "body": "I've been edited!"}
|
||||
|
|
@ -1086,7 +1086,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
content={"msgtype": "m.text", "body": "foo", "m.new_content": new_body},
|
||||
parent_id=reply,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
edit_event_id = channel.json_body["event_id"]
|
||||
|
||||
|
|
@ -1095,7 +1095,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
"/rooms/%s/event/%s" % (self.room, reply),
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
# We expect to see the new body in the dict, as well as the reference
|
||||
# metadata sill intact.
|
||||
|
|
@ -1133,7 +1133,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
"m.room.message",
|
||||
content={"msgtype": "m.text", "body": "A threaded reply!"},
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
threaded_event_id = channel.json_body["event_id"]
|
||||
|
||||
new_body = {"msgtype": "m.text", "body": "I've been edited!"}
|
||||
|
|
@ -1143,7 +1143,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
content={"msgtype": "m.text", "body": "foo", "m.new_content": new_body},
|
||||
parent_id=threaded_event_id,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
# Fetch the thread root, to get the bundled aggregation for the thread.
|
||||
channel = self.make_request(
|
||||
|
|
@ -1151,7 +1151,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/rooms/{self.room}/event/{self.parent_id}",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
# We expect that the edit message appears in the thread summary in the
|
||||
# unsigned relations section.
|
||||
|
|
@ -1161,9 +1161,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
thread_summary = relations_dict[RelationTypes.THREAD]
|
||||
self.assertIn("latest_event", thread_summary)
|
||||
latest_event_in_thread = thread_summary["latest_event"]
|
||||
self.assertEquals(
|
||||
latest_event_in_thread["content"]["body"], "I've been edited!"
|
||||
)
|
||||
self.assertEqual(latest_event_in_thread["content"]["body"], "I've been edited!")
|
||||
|
||||
def test_edit_edit(self):
|
||||
"""Test that an edit cannot be edited."""
|
||||
|
|
@ -1177,7 +1175,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
"m.new_content": new_body,
|
||||
},
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
edit_event_id = channel.json_body["event_id"]
|
||||
|
||||
# Edit the edit event.
|
||||
|
|
@ -1191,7 +1189,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
},
|
||||
parent_id=edit_event_id,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
# Request the original event.
|
||||
channel = self.make_request(
|
||||
|
|
@ -1199,9 +1197,9 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
"/rooms/%s/event/%s" % (self.room, self.parent_id),
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
# The edit to the edit should be ignored.
|
||||
self.assertEquals(channel.json_body["content"], new_body)
|
||||
self.assertEqual(channel.json_body["content"], new_body)
|
||||
|
||||
# The relations information should not include the edit to the edit.
|
||||
relations_dict = channel.json_body["unsigned"].get("m.relations")
|
||||
|
|
@ -1234,7 +1232,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
"m.new_content": {"msgtype": "m.text", "body": "First edit"},
|
||||
},
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
# Check the relation is returned
|
||||
channel = self.make_request(
|
||||
|
|
@ -1243,10 +1241,10 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
% (self.room, original_event_id),
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
self.assertIn("chunk", channel.json_body)
|
||||
self.assertEquals(len(channel.json_body["chunk"]), 1)
|
||||
self.assertEqual(len(channel.json_body["chunk"]), 1)
|
||||
|
||||
# Redact the original event
|
||||
channel = self.make_request(
|
||||
|
|
@ -1256,7 +1254,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
access_token=self.user_token,
|
||||
content="{}",
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
# Try to check for remaining m.replace relations
|
||||
channel = self.make_request(
|
||||
|
|
@ -1265,11 +1263,11 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
% (self.room, original_event_id),
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
# Check that no relations are returned
|
||||
self.assertIn("chunk", channel.json_body)
|
||||
self.assertEquals(channel.json_body["chunk"], [])
|
||||
self.assertEqual(channel.json_body["chunk"], [])
|
||||
|
||||
def test_aggregations_redaction_prevents_access_to_aggregations(self):
|
||||
"""Test that annotations of an event are redacted when the original event
|
||||
|
|
@ -1283,7 +1281,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
channel = self._send_relation(
|
||||
RelationTypes.ANNOTATION, "m.reaction", key="👍", parent_id=original_event_id
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
# Redact the original
|
||||
channel = self.make_request(
|
||||
|
|
@ -1297,7 +1295,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
access_token=self.user_token,
|
||||
content="{}",
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
# Check that aggregations returns zero
|
||||
channel = self.make_request(
|
||||
|
|
@ -1306,15 +1304,15 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
% (self.room, original_event_id),
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
self.assertIn("chunk", channel.json_body)
|
||||
self.assertEquals(channel.json_body["chunk"], [])
|
||||
self.assertEqual(channel.json_body["chunk"], [])
|
||||
|
||||
def test_unknown_relations(self):
|
||||
"""Unknown relations should be accepted."""
|
||||
channel = self._send_relation("m.relation.test", "m.room.test")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
event_id = channel.json_body["event_id"]
|
||||
|
||||
channel = self.make_request(
|
||||
|
|
@ -1323,18 +1321,18 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
% (self.room, self.parent_id),
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
|
||||
# We expect to get back a single pagination result, which is the full
|
||||
# relation event we sent above.
|
||||
self.assertEquals(len(channel.json_body["chunk"]), 1, channel.json_body)
|
||||
self.assertEqual(len(channel.json_body["chunk"]), 1, channel.json_body)
|
||||
self.assert_dict(
|
||||
{"event_id": event_id, "sender": self.user_id, "type": "m.room.test"},
|
||||
channel.json_body["chunk"][0],
|
||||
)
|
||||
|
||||
# We also expect to get the original event (the id of which is self.parent_id)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
channel.json_body["original_event"]["event_id"], self.parent_id
|
||||
)
|
||||
|
||||
|
|
@ -1344,7 +1342,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
"/rooms/%s/event/%s" % (self.room, self.parent_id),
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
self.assertNotIn("m.relations", channel.json_body["unsigned"])
|
||||
|
||||
# But unknown relations can be directly queried.
|
||||
|
|
@ -1354,8 +1352,8 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
% (self.room, self.parent_id),
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEquals(channel.json_body["chunk"], [])
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
self.assertEqual(channel.json_body["chunk"], [])
|
||||
|
||||
def _find_event_in_chunk(self, events: List[JsonDict]) -> JsonDict:
|
||||
"""
|
||||
|
|
@ -1422,15 +1420,15 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
def test_background_update(self):
|
||||
"""Test the event_arbitrary_relations background update."""
|
||||
channel = self._send_relation(RelationTypes.ANNOTATION, "m.reaction", key="👍")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
annotation_event_id_good = channel.json_body["event_id"]
|
||||
|
||||
channel = self._send_relation(RelationTypes.ANNOTATION, "m.reaction", key="A")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
annotation_event_id_bad = channel.json_body["event_id"]
|
||||
|
||||
channel = self._send_relation(RelationTypes.THREAD, "m.room.test")
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
thread_event_id = channel.json_body["event_id"]
|
||||
|
||||
# Clean-up the table as if the inserts did not happen during event creation.
|
||||
|
|
@ -1450,8 +1448,8 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/_matrix/client/unstable/rooms/{self.room}/relations/{self.parent_id}?limit=10",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEquals(
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
self.assertEqual(
|
||||
[ev["event_id"] for ev in channel.json_body["chunk"]],
|
||||
[annotation_event_id_good],
|
||||
)
|
||||
|
|
@ -1475,7 +1473,7 @@ class RelationsTestCase(unittest.HomeserverTestCase):
|
|||
f"/_matrix/client/unstable/rooms/{self.room}/relations/{self.parent_id}?limit=10",
|
||||
access_token=self.user_token,
|
||||
)
|
||||
self.assertEquals(200, channel.code, channel.json_body)
|
||||
self.assertEqual(200, channel.code, channel.json_body)
|
||||
self.assertCountEqual(
|
||||
[ev["event_id"] for ev in channel.json_body["chunk"]],
|
||||
[annotation_event_id_good, thread_event_id],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue