Merge remote-tracking branch 'origin/release-v1.62' into develop

This commit is contained in:
Patrick Cloke 2022-06-30 13:27:24 -04:00
commit b0366853ca
6 changed files with 64 additions and 33 deletions

View file

@ -136,15 +136,12 @@ class EventPushActionsStoreTestCase(HomeserverTestCase):
last_read_stream_ordering[0] = stream
self.get_success(
self.store.db_pool.runInteraction(
"",
self.store._insert_linearized_receipt_txn,
self.store.insert_receipt(
room_id,
"m.read",
user_id,
f"$test{stream}:example.com",
{},
stream,
user_id=user_id,
event_ids=[f"$test{stream}:example.com"],
data={},
)
)
@ -168,6 +165,7 @@ class EventPushActionsStoreTestCase(HomeserverTestCase):
_inject_actions(6, PlAIN_NOTIF)
_rotate(7)
_assert_counts(1, 0)
self.get_success(
self.store.db_pool.simple_delete(