diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-08-27 07:41:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-27 07:41:01 -0400 |
| commit | 30426c7063a7e5567ac21cd10267651ef1935360 (patch) | |
| tree | d18f000a9576bc52742301ed37793c6563914004 /tests/storage | |
| parent | Convert simple_update* and simple_select* to async (#8173) (diff) | |
| download | synapse-30426c7063a7e5567ac21cd10267651ef1935360.tar.xz | |
Convert additional database methods to async (select list, search, insert_many, delete_*) (#8168)
Diffstat (limited to 'tests/storage')
| -rw-r--r-- | tests/storage/test_background_update.py | 5 | ||||
| -rw-r--r-- | tests/storage/test_base.py | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/storage/test_background_update.py b/tests/storage/test_background_update.py index 2efbc97c2e..1a1c59256c 100644 --- a/tests/storage/test_background_update.py +++ b/tests/storage/test_background_update.py @@ -67,13 +67,12 @@ class BackgroundUpdateTestCase(unittest.HomeserverTestCase): # second step: complete the update # we should now get run with a much bigger number of items to update - @defer.inlineCallbacks - def update(progress, count): + async def update(progress, count): self.assertEqual(progress, {"my_key": 2}) self.assertAlmostEqual( count, target_background_update_duration_ms / duration_ms, places=0, ) - yield self.updates._end_background_update("test_update") + await self.updates._end_background_update("test_update") return count self.update_handler.side_effect = update diff --git a/tests/storage/test_base.py b/tests/storage/test_base.py index 64abe8cc49..40ba652248 100644 --- a/tests/storage/test_base.py +++ b/tests/storage/test_base.py @@ -197,8 +197,10 @@ class SQLBaseStoreTestCase(unittest.TestCase): def test_delete_one(self): self.mock_txn.rowcount = 1 - yield self.datastore.db_pool.simple_delete_one( - table="tablename", keyvalues={"keycol": "Go away"} + yield defer.ensureDeferred( + self.datastore.db_pool.simple_delete_one( + table="tablename", keyvalues={"keycol": "Go away"} + ) ) self.mock_txn.execute.assert_called_with( |