Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-04 18:34:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Do not yield on awaitables in tests. (#8193)

Browse source
This commit is contained in:
Patrick Cloke 2020-08-27 17:24:46 -04:00 • committed by GitHub
parent b49a5b9307
commit e00816ad98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 230 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

78
tests/storage/test_event_push_actions.py
View file

@ -60,8 +60,10 @@ class EventPushActionsStoreTestCase(tests.unittest.TestCase):
@defer.inlineCallbacks
def _assert_counts(noitf_count, highlight_count):
counts = yield self.store.db_pool.runInteraction(
"", self.store._get_unread_counts_by_pos_txn, room_id, user_id, 0
counts = yield defer.ensureDeferred(
self.store.db_pool.runInteraction(
"", self.store._get_unread_counts_by_pos_txn, room_id, user_id, 0
)
)
self.assertEquals(
counts,
@ -81,25 +83,31 @@ class EventPushActionsStoreTestCase(tests.unittest.TestCase):
event.event_id, {user_id: action}
)
)
yield self.store.db_pool.runInteraction(
"",
self.persist_events_store._set_push_actions_for_event_and_users_txn,
[(event, None)],
[(event, None)],
yield defer.ensureDeferred(
self.store.db_pool.runInteraction(
"",
self.persist_events_store._set_push_actions_for_event_and_users_txn,
[(event, None)],
[(event, None)],
)
)
def _rotate(stream):
return self.store.db_pool.runInteraction(
"", self.store._rotate_notifs_before_txn, stream
return defer.ensureDeferred(
self.store.db_pool.runInteraction(
"", self.store._rotate_notifs_before_txn, stream
)
)
def _mark_read(stream, depth):
return self.store.db_pool.runInteraction(
"",
self.store._remove_old_push_actions_before_txn,
room_id,
user_id,
stream,
return defer.ensureDeferred(
self.store.db_pool.runInteraction(
"",
self.store._remove_old_push_actions_before_txn,
room_id,
user_id,
stream,
)
)
yield _assert_counts(0, 0)
@ -163,16 +171,24 @@ class EventPushActionsStoreTestCase(tests.unittest.TestCase):
)
# start with the base case where there are no events in the table
r = yield self.store.find_first_stream_ordering_after_ts(11)
r = yield defer.ensureDeferred(
self.store.find_first_stream_ordering_after_ts(11)
)
self.assertEqual(r, 0)
# now with one event
yield add_event(2, 10)
r = yield self.store.find_first_stream_ordering_after_ts(9)
r = yield defer.ensureDeferred(
self.store.find_first_stream_ordering_after_ts(9)
)
self.assertEqual(r, 2)
r = yield self.store.find_first_stream_ordering_after_ts(10)
r = yield defer.ensureDeferred(
self.store.find_first_stream_ordering_after_ts(10)
)
self.assertEqual(r, 2)
r = yield self.store.find_first_stream_ordering_after_ts(11)
r = yield defer.ensureDeferred(
self.store.find_first_stream_ordering_after_ts(11)
)
self.assertEqual(r, 3)
# add a bunch of dummy events to the events table
@ -185,25 +201,37 @@ class EventPushActionsStoreTestCase(tests.unittest.TestCase):
):
yield add_event(stream_ordering, ts)
r = yield self.store.find_first_stream_ordering_after_ts(110)
r = yield defer.ensureDeferred(
self.store.find_first_stream_ordering_after_ts(110)
)
self.assertEqual(r, 3, "First event after 110ms should be 3, was %i" % r)
# 4 and 5 are both after 120: we want 4 rather than 5
r = yield self.store.find_first_stream_ordering_after_ts(120)
r = yield defer.ensureDeferred(
self.store.find_first_stream_ordering_after_ts(120)
)
self.assertEqual(r, 4, "First event after 120ms should be 4, was %i" % r)
r = yield self.store.find_first_stream_ordering_after_ts(129)
r = yield defer.ensureDeferred(
self.store.find_first_stream_ordering_after_ts(129)
)
self.assertEqual(r, 10, "First event after 129ms should be 10, was %i" % r)
# check we can get the last event
r = yield self.store.find_first_stream_ordering_after_ts(140)
r = yield defer.ensureDeferred(
self.store.find_first_stream_ordering_after_ts(140)
)
self.assertEqual(r, 20, "First event after 14ms should be 20, was %i" % r)
# off the end
r = yield self.store.find_first_stream_ordering_after_ts(160)
r = yield defer.ensureDeferred(
self.store.find_first_stream_ordering_after_ts(160)
)
self.assertEqual(r, 21)
# check we can find an event at ordering zero
yield add_event(0, 5)
r = yield self.store.find_first_stream_ordering_after_ts(1)
r = yield defer.ensureDeferred(
self.store.find_first_stream_ordering_after_ts(1)
)
self.assertEqual(r, 0)