Changeset cbc3477 in mod_gnutls

Timestamp:

Sep 23, 2020, 5:59:39 AM (7 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio

Children:

be2ad50

Parents:

4b9e34a

Message:

Skip MSVA test if building without MSVA auth support

Skipping instead of excluding it from the list of tests removes a
special case, and might allow simplifications in test handling later.

Location:

test

Files:

• Makefile.am (modified) (3 diffs)
• tests/15_basic_msva/hooks.py (modified) (1 diff)

test/Makefile.am

@@ -28 +28 @@
         test-10_client_verification.bash \
         test-12_cgi_variables.bash \
-        test-14_resume_session.bash
-if USE_MSVA
-test_scripts += test-15_basic_msva.bash
-endif
-test_scripts += test-16_view-status.bash \
+        test-14_resume_session.bash \
+        test-15_basic_msva.bash \
+        test-16_view-status.bash \
         test-17_cgi_vars_large_cert.bash \
         test-19_TLS_reverse_proxy.bash \
@@ -318 +316 @@
         export TEST_HOST="@TEST_HOST@"; \
         export TEST_PORT="$(TEST_PORT)"; \
-        export MSVA_PORT="$(MSVA_PORT)"; \
         export TEST_SERVICE_MAX_WAIT="$(TEST_SERVICE_MAX_WAIT)"; \
         export TEST_SERVICE_WAIT="$(TEST_SERVICE_WAIT)"; \
@@ -326 +323 @@
         export TEST_HTTP_PORT="$(TEST_HTTP_PORT)"; \
         export HTTP_CLI="@HTTP_CLI@";
+
+if USE_MSVA
+AM_TESTS_ENVIRONMENT += export MSVA_PORT="$(MSVA_PORT)";
+endif
 
 if HAVE_SOFTHSM

test/tests/15_basic_msva/hooks.py

@@ -1 +1 @@
 import os
+from unittest import SkipTest
 
 def prepare_env():
+    if 'MSVA_PORT' not in os.environ:
+        raise SkipTest('Build without MSVA support.')
     os.environ['USE_MSVA'] = 'yes'