Changeset 7eb4233 in mod_gnutls for test/runtest.py

Timestamp:

Nov 28, 2020, 3:29:24 PM (21 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master

Children:

65e66c9

Parents:

32e62a3

Message:

Use asyncio to manage test services

This makes it a little easier to handle the services in parallel.

File:

• test/runtest.py (modified) (4 diffs)

test/runtest.py

@@ -16 +16 @@
 # limitations under the License.
 
+import asyncio
 import contextlib
 import os
@@ -85 +86 @@
 
 
-def main(args):
+async def main(args):
     # The Automake environment always provides srcdir, the default is
     # for manual use.
@@ -161 +162 @@
             f'http://127.0.0.1:{os.environ["MSVA_PORT"]}'
 
-    with contextlib.ExitStack() as service_stack:
+    async with contextlib.AsyncExitStack() as service_stack:
         if cleanup_callback:
             service_stack.callback(cleanup_callback)
         service_stack.enter_context(
             lockfile('test.lock', nolock='MGS_NETNS_ACTIVE' in os.environ))
-        service_stack.enter_context(ocsp.run())
-        service_stack.enter_context(backend.run())
-        service_stack.enter_context(msva.run())
 
         # TEST_SERVICE_MAX_WAIT is in milliseconds
         wait_timeout = \
             int(os.environ.get('TEST_SERVICE_MAX_WAIT', 10000)) / 1000
-        for s in bg_services:
-            if s.condition():
-                s.wait_ready(timeout=wait_timeout)
+        await asyncio.wait(
+            {asyncio.create_task(
+                service_stack.enter_async_context(
+                    s.run(ready_timeout=wait_timeout)))
+             for s in bg_services})
 
         # special case: expected to fail in a few cases
-        service_stack.enter_context(apache.run())
-        failed = apache.wait_ready()
+        await service_stack.enter_async_context(apache.run())
+        failed = await apache.wait_ready()
         if os.path.exists(os.path.join(testdir, 'fail.server')):
             if failed:
@@ -252 +252 @@
         stack.enter_context(contextlib.closing(args.log_connection))
         stack.enter_context(contextlib.closing(args.log_responses))
-        main(args)
+        asyncio.run(main(args))