Changeset 65e66c9 in mod_gnutls

Timestamp:

Nov 28, 2020, 3:46:31 PM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master

Children:

12ed912

Parents:

7eb4233

Message:

Turn "service ready" check functions into coroutines

This way checks that call subprocesses don't block other tasks.

Location:

test

Files:

• mgstest/services.py (modified) (3 diffs)
• runtest.py (modified) (2 diffs)

test/mgstest/services.py

@@ -51 +51 @@
             self.process_env = None
 
-        # check: function to check if the service is up and working
+        # check: coroutine to check if the service is up and working
         self.check = check
 
@@ -123 +123 @@
             if self.process and self.process.returncode is not None:
                 return self.process.returncode
-            if self.check():
+            if await self.check():
                 return None
             else:
@@ -181 +181 @@
         return self.config.is_file()
 
-    def pidfile_check(self):
+    async def pidfile_check(self):
         """Default check method for ApacheService, waits for the PID file to
         be present."""

test/runtest.py

@@ -65 +65 @@
 
 
-def check_ocsp_responder():
+async def check_ocsp_responder():
     # Check if OCSP responder works
     issuer_cert = 'authority/x509.pem'
     check_cert = 'authority/server/x509.pem'
-    command = ['ocsptool', '--ask', '--nonce',
-               '--load-issuer', issuer_cert,
-               '--load-cert', check_cert]
-    return subprocess.run(command).returncode == 0
-
-
-def check_msva():
+    proc = await asyncio.create_subprocess_exec(
+        'ocsptool', '--ask', '--nonce',
+        '--load-issuer', issuer_cert, '--load-cert', check_cert)
+    return (await proc.wait()) == 0
+
+
+async def check_msva():
     # Check if MSVA is up
     cert_file = 'authority/client/x509.pem'
@@ -81 +81 @@
     with open(uid_file, 'r') as file:
         uid = file.read().strip()
-        command = ['msva-query-agent', 'https', uid, 'x509pem', 'client']
-        with open(cert_file, 'r') as cert:
-            return subprocess.run(command, stdin=cert).returncode == 0
+    with open(cert_file, 'r') as cert:
+        proc = await asyncio.create_subprocess_exec(
+            'msva-query-agent', 'https', uid, 'x509pem', 'client',
+            stdin=cert)
+        return (await proc.wait()) == 0