Merge commit 'e00816ad9' into anoa/dinsic_release_1_21_x

* commit 'e00816ad9':
  Do not yield on awaitables in tests. (#8193)

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/storage/test_main.py b/tests/storage/test_main.py

index 745fa15e26..fe37d2ed5a 100644
--- a/tests/storage/test_main.py
+++ b/tests/storage/test_main.py
@@ -42,8 +42,8 @@ class DataStoreTestCase(unittest.TestCase):
             self.store.set_profile_displayname(self.user.localpart, self.displayname, 1)
         )
 
-        users, total = yield self.store.get_users_paginate(
-            0, 10, name="bc", guests=False
+        users, total = yield defer.ensureDeferred(
+            self.store.get_users_paginate(0, 10, name="bc", guests=False)
         )
 
         self.assertEquals(1, total)