test: extract common function

cleoold · cleoold · commit bb0ce07862e7 · 2021-10-12T12:52:26.000-04:00
because it looks awful
diff --git a/testing/external/common/client.py b/testing/external/common/client.py
@@ -89,6 +89,17 @@ async def gatherer():
             yield gatherer()
         yield
 
+    async def run_client_until_test_done(self, local_port: int, load_timeout: float = MERCY_TM) -> AsyncGenerator:
+        '''Provide this wrapper because it's very difficult to understand connect_to_nonebot'''
+        cl_conn = self.connect_to_nonebot(local_port, load_timeout)
+        await cl_conn.__anext__()
+        task = asyncio.create_task(await cl_conn.__anext__())
+        await asyncio.sleep(0)
+        yield self
+        task.cancel()
+        await cl_conn.__anext__()
+        self.stop_nonebot()
+
     async def wait_for_matching_log(self, *pats: str, tm: float = MERCY_TM):
         while True:
             try:
diff --git a/testing/external/common/pytest.py b/testing/external/common/pytest.py
@@ -0,0 +1,12 @@
+import asyncio
+
+import pytest
+
+
+class AsyncTestCase:
+    @pytest.fixture(scope='class')
+    def event_loop(self):
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+        yield loop
+        loop.close()
diff --git a/testing/external/test_command/test_basics_work/runner.py b/testing/external/test_command/test_basics_work/runner.py
@@ -6,18 +6,12 @@
 import nonebot
 import testing.external.common.default_config as dc
 from testing.external.common.client import TESTER_ID, Client, run_nonebot_in_thread
+from testing.external.common.pytest import AsyncTestCase
 from testing.external.common.port import available_port
 
 
 @pytest.mark.asyncio
-class TestBasicsWork:
-    @pytest.fixture(scope='class')
-    def event_loop(self):
-        loop = asyncio.new_event_loop()
-        asyncio.set_event_loop(loop)
-        yield loop
-        loop.close()
-
+class TestBasicsWork(AsyncTestCase):
     @pytest.fixture(scope='class')
     async def cl(self):
         nonebot.init(dc)
@@ -27,14 +21,8 @@ async def cl(self):
         cl.patch_nonebot()
 
         run_nonebot_in_thread()
-        cl_conn = cl.connect_to_nonebot(available_port)
-        await cl_conn.__anext__()
-        task = asyncio.create_task(await cl_conn.__anext__())
-        await asyncio.sleep(0)
-        yield cl
-        task.cancel()
-        await cl_conn.__anext__()
-        cl.stop_nonebot()
+        async for p in cl.run_client_until_test_done(available_port):
+            yield p
 
     async def test_everyone_ping(self, cl: Client):
         cl.proxy.send_private_msg('/ping')
