Changeset 9a48691 in mod_gnutls

Timestamp:

Jan 8, 2020, 3:32:30 PM (11 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

baa0056

Parents:

dda0f4a

Message:

Test suite: Support checking preconditions in prepare_env hook

The hook may now raise unittest.SkipTest? to skip the test case if any
preconditions (e.g. availability of a certain Apache module) are not
met.

Location:

test

Files:

• mgstest/hooks.py (modified) (1 diff)
• runtest.py (modified) (2 diffs)

test/mgstest/hooks.py

@@ -21 +21 @@
     prepare_env:
 
-        This hook runs before the test services are started. It can
-        set any additional environment variables the test might need.
+        This hook runs before the test services are started. It serves
+        two purposes:
+
+        1. Check special precondition the test might need
+        (e.g. availability of a certain Apache module), and raise
+        unittest.SkipTest to skip the test case if they are not met.
+
+        2. Set any additional environment variables the test might
+        need.
 
     run_connection:

test/runtest.py

@@ -22 +22 @@
 import sys
 import tempfile
+from unittest import SkipTest
 
 import mgstest.hooks
@@ -131 +132 @@
 
     # This hook may modify the environment as needed for the test.
-    if plugin.prepare_env:
-        plugin.prepare_env()
+    try:
+        if plugin.prepare_env:
+            plugin.prepare_env()
+    except SkipTest as skip:
+        print(f'Skipping: {skip!s}')
+        sys.exit(77)
 
     # If VERBOSE is enabled, log the HTTPD build configuration