Apply the timeout separately to each pylsp test

Author: eliericha

testsuite/drivers/pylsp.py

@@ -118,14 +118,16 @@ def run(self) -> None:
                 if r.status != 0:
                     raise TestAbortWithFailure("non-zero status code")
             else:
+                # Usually we specify a timeout here, however a test file may
+                # contain multiple tests. So instead we apply a timeout to each
+                # test in async_wrapper()
                 p: ProcessResult = self.shell(
                     cmd,
                     # Start the test process directly in the test work dir. This way
                     # tests can simply assume that the current dir is the test work dir.
                     cwd=str(wd),
                     env=env,
                     ignore_environ=False,
-                    timeout=15,  # seconds
                     stdin=None,
                 )
 
@@ -647,8 +649,9 @@ async def async_wrapper(
 
             LOG.info("Running test function: %s", func.__name__)
 
-            # Run the test
-            await func(client)
+            # Run the test with a timeout
+            async with asyncio.timeout(15):  # seconds
+                await func(client)
 
             if assert_no_lsp_errors:
                 # Assert the absence of Error LSP log messages