Changeset 7e10018 in mod_gnutls

Timestamp:

Jan 9, 2020, 9:49:58 AM (10 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master, proxy-ticket

Children:

60ed7d1

Parents:

573b810

Message:

runtest.py: Get Apache debug info before running prepare_env hook

This minimizes the risk of exceptions between the hook and the with
block containing the services, allowing for the hook to return a
cleanup callback later.

File:

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

test/runtest.py

@@ -129 +129 @@
     bg_services = [backend, ocsp, msva]
 
-    # TODO: check extra requirements (e.g. specific modules)
+    # If VERBOSE is enabled, log the HTTPD build configuration
+    if 'VERBOSE' in os.environ:
+        apache2 = os.environ.get('APACHE2', 'apache2')
+        subprocess.run([apache2, '-f', f'{srcdir}/base_apache.conf', '-V'],
+                       check=True)
 
     # This hook may modify the environment as needed for the test.
@@ -138 +142 @@
         print(f'Skipping: {skip!s}')
         sys.exit(77)
-
-    # If VERBOSE is enabled, log the HTTPD build configuration
-    if 'VERBOSE' in os.environ:
-        apache2 = os.environ.get('APACHE2', 'apache2')
-        subprocess.run([apache2, '-f', f'{srcdir}/base_apache.conf', '-V'],
-                       check=True)
 
     if 'USE_MSVA' in os.environ: