Changeset 0f52d48 in mod_gnutls

Timestamp:

Jan 8, 2020, 5:06:31 PM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, main, master, proxy-ticket

Children:

482bafc

Parents:

baa0056

Message:

Switch most tests to hooks.py instead of preconditions in test scripts

The new function mgstest.require_apache_modules() covers required
Apache modules, the rest is individual stuff.

Location:

test

Files:

• mgstest/__init__.py (modified) (2 diffs)
• test-27_OCSP_server.bash (modified) (1 diff)
• test-28_HTTP2_support.bash (modified) (1 diff)
• test-34_TLS_reverse_proxy_h2.bash (modified) (1 diff)
• tests/27_OCSP_server/hooks.py (modified) (1 diff)
• tests/28_HTTP2_support/hooks.py (modified) (1 diff)
• tests/34_TLS_reverse_proxy_h2/hooks.py (added)
• tests/Makefile.am (modified) (1 diff)

test/mgstest/__init__.py

@@ -18 +18 @@
 
 import fcntl
+import os
+import os.path
 import sys
 
 from contextlib import contextmanager
+from unittest import SkipTest
 
 class TestExpectationFailed(Exception):
@@ -88 +91 @@
     else:
         raise TestExpectationFailed(f'No match found for {regexp.pattern}!')
+
+
+
+def require_apache_modules(*modules):
+    """Raise unittest.SkipTest if any of the given module files (full file
+    name) is not present in AP_LIBEXECDIR.
+
+    """
+    mod_dir = os.environ['AP_LIBEXECDIR']
+    for mod in modules:
+        if not os.path.isfile(os.path.join(mod_dir, mod)):
+            raise SkipTest(f'{mod} not found, skipping.')

test/test-27_OCSP_server.bash

@@ -1 +1 @@
 #!/bin/bash
-
-# Skip if OCSP tests are not enabled
-[ -n "${OCSP_PORT}" ] || exit 77
-
 . ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 27

test/test-28_HTTP2_support.bash

@@ -1 +1 @@
 #!/bin/bash
-#
-# Check if HTTP/2 connections using mod_gnutls and mod_http2 work
-
-set -e
-
-if [ ! -r ${AP_LIBEXECDIR}/mod_http2.so ]; then
-    echo "mod_http2.so not found, skipping." 2>&1
-    exit 77
-elif [ "$(basename ${HTTP_CLI})" != "curl" ] \
-       || ! ${HTTP_CLI} -V | grep -P '\sHTTP2($|\s)'; then
-    echo "Curl not found or does not support HTTP/2, skipping." 2>&1
-    exit 77
-fi
-
 . ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 28

test/test-34_TLS_reverse_proxy_h2.bash

@@ -1 +1 @@
 #!/bin/bash
-for mod in mod_http2.so mod_proxy_http2.so; do
-    if [ ! -r "${AP_LIBEXECDIR}/${mod}" ]; then
-        echo "${mod} not found, skipping." 2>&1
-        exit 77
-    fi
-done
 . ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 34

test/tests/27_OCSP_server/hooks.py

@@ +1 @@
+import os
 import re
 from mgstest import require_match
+from unittest import SkipTest
+
+def prepare_env():
+    if not 'OCSP_PORT' in os.environ:
+        raise SkipTest('OCSP_PORT is not set, check if openssl is available.')
 
 def post_check(conn_log, response_log):

test/tests/28_HTTP2_support/hooks.py

@@ -2 +2 @@
 import re
 import subprocess
-from mgstest import require_match
+from mgstest import require_apache_modules, require_match
+from unittest import SkipTest
+
+def prepare_env():
+    require_apache_modules('mod_http2.so')
+    curl = os.environ['HTTP_CLI']
+    if curl == 'no':
+        raise SkipTest(f'{curl} not found!')
+    proc = subprocess.run([curl, '-V'], stdout=subprocess.PIPE,
+                          check=True, text=True)
+    if not re.search(r'\bHTTP2\b', proc.stdout):
+        raise SkipTest(f'{curl} does not support HTTP/2!')
 
 def run_connection(testname, conn_log, response_log):
+    """Check if HTTP/2 connections using mod_gnutls and mod_http2 work."""
+
     url = f'https://{os.environ["TEST_HOST"]}:{os.environ["TEST_PORT"]}' \
         '/status?auto'

test/tests/Makefile.am

@@ -34 +34 @@
         32_vhost_SNI_serveralias_mismatch/apache.conf 32_vhost_SNI_serveralias_mismatch/test.yml \
         33_vhost_SNI_serveralias_missinghost/apache.conf 33_vhost_SNI_serveralias_missinghost/test.yml \
-        34_TLS_reverse_proxy_h2/apache.conf 34_TLS_reverse_proxy_h2/backend.conf 34_TLS_reverse_proxy_h2/test.yml
+        34_TLS_reverse_proxy_h2/apache.conf 34_TLS_reverse_proxy_h2/hooks.py 34_TLS_reverse_proxy_h2/backend.conf 34_TLS_reverse_proxy_h2/test.yml