address review

Author: sleepyStick

test/asynchronous/test_gridfs.py

@@ -77,32 +77,32 @@ def run(self):
 
     class JustWrite:
         def __init__(self, fs, n):
-            async def run():
-                for _ in range(self.n):
-                    file = self.fs.new_file(filename="test")
-                    await file.write(b"hello")
-                    await file.close()
-
-            self.task = asyncio.create_task(run())
+            self.task = asyncio.create_task(self.run())
             self.fs = fs
             self.n = n
             self.daemon = True
 
+        async def run(self):
+            for _ in range(self.n):
+                file = self.fs.new_file(filename="test")
+                await file.write(b"hello")
+                await file.close()
+
     class JustRead:
         def __init__(self, fs, n, results):
-            async def run():
-                for _ in range(self.n):
-                    file = await self.fs.get("test")
-                    data = await file.read()
-                    self.results.append(data)
-                    assert data == b"hello"
-
-            self.task = asyncio.create_task(run())
+            self.task = asyncio.create_task(self.run())
             self.fs = fs
             self.n = n
             self.results = results
             self.daemon = True
 
+        async def run(self):
+            for _ in range(self.n):
+                file = await self.fs.get("test")
+                data = await file.read()
+                self.results.append(data)
+                assert data == b"hello"
+
 
 class TestGridfsNoConnect(unittest.IsolatedAsyncioTestCase):
     db: AsyncDatabase

test/test_gridfs.py

@@ -77,32 +77,32 @@ def run(self):
 
     class JustWrite:
         def __init__(self, fs, n):
-            def run():
-                for _ in range(self.n):
-                    file = self.fs.new_file(filename="test")
-                    file.write(b"hello")
-                    file.close()
-
-            self.task = asyncio.create_task(run())
+            self.task = asyncio.create_task(self.run())
             self.fs = fs
             self.n = n
             self.daemon = True
 
+        def run(self):
+            for _ in range(self.n):
+                file = self.fs.new_file(filename="test")
+                file.write(b"hello")
+                file.close()
+
     class JustRead:
         def __init__(self, fs, n, results):
-            def run():
-                for _ in range(self.n):
-                    file = self.fs.get("test")
-                    data = file.read()
-                    self.results.append(data)
-                    assert data == b"hello"
-
-            self.task = asyncio.create_task(run())
+            self.task = asyncio.create_task(self.run())
             self.fs = fs
             self.n = n
             self.results = results
             self.daemon = True
 
+        def run(self):
+            for _ in range(self.n):
+                file = self.fs.get("test")
+                data = file.read()
+                self.results.append(data)
+                assert data == b"hello"
+
 
 class TestGridfsNoConnect(unittest.TestCase):
     db: Database

test/utils.py

@@ -668,7 +668,7 @@ def joinall(threads):
 async def asyncjoinall(tasks):
     """Join tasks with a 5-minute timeout, assert joins succeeded"""
     for t in tasks:
-        await asyncio.wait_for(t.task, 300)
+        await asyncio.wait([t.task], timeout=300)
         assert t.task.done(), "Task %s hung" % t