Changeset 0909c92 in mod_gnutls

Timestamp:

Dec 27, 2019, 12:40:51 PM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, main, master, proxy-ticket

Children:

3039495

Parents:

05984a0

Message:

Add hooks system to the test runner

With this all tests can use runtest.py to set up their
environment. Note that at the moment only the run_connection hook is
implemented.

Location:

test

Files:

• Makefile.am (modified) (2 diffs)
• apache_service.bash (deleted)
• mgstest/hooks.py (added)
• runtest.py (modified) (4 diffs)
• test-28_HTTP2_support.bash (modified) (2 diffs)
• tests/28_HTTP2_support/hooks.py (added)
• tests/Makefile.am (modified) (1 diff)

test/Makefile.am

@@ -58 +58 @@
 # Python tools for tests
 noinst_PYTHON = https-test-client.py mgstest/http.py mgstest/__init__.py \
-        mgstest/services.py mgstest/tests.py runtest.py
+        mgstest/hooks.py mgstest/services.py mgstest/tests.py runtest.py
 
 # Identities in the miniature CA, server, and client environment for
@@ -254 +254 @@
 
 EXTRA_DIST = $(apache_data) $(cert_templates) $(shared_identities:=/uid.in) \
-        apache_service.bash common.bash authority/server/crl.template \
-        softhsm.bash
+        common.bash authority/server/crl.template softhsm.bash
 
 # Lockfile for the main Apache process

test/runtest.py

@@ -22 +22 @@
 import sys
 
+import mgstest.hooks
 from mgstest import lockfile, TestExpectationFailed
 from mgstest.services import ApacheService, TestService
@@ -110 +111 @@
     os.environ['TEST_NAME'] = testname
 
+    # Load test case hooks (if any)
+    plugin_path = os.path.join(testdir, 'hooks.py')
+    plugin = mgstest.hooks.load_hooks_plugin(plugin_path)
+
     # PID file name varies depending on whether we're using
     # namespaces.
@@ -187 +192 @@
         # Run the test connections
         with contextlib.ExitStack() as stack:
-            test_conf = stack.enter_context(
-                open(os.path.join(testdir, 'test.yml'), 'r'))
             log_file = None
             output_file = None
@@ -196 +199 @@
                 output_file = stack.enter_context(open(args.log_responses, 'w'))
 
-            run_test_conf(test_conf,
-                          float(os.environ.get('TEST_QUERY_TIMEOUT', 5.0)),
-                          conn_log=log_file, response_log=output_file)
+            if plugin.run_connection:
+                plugin.run_connection(testname,
+                                      conn_log=log_file,
+                                      response_log=output_file)
+            else:
+                test_conf = stack.enter_context(
+                    open(os.path.join(testdir, 'test.yml'), 'r'))
+                run_test_conf(test_conf,
+                              float(os.environ.get('TEST_QUERY_TIMEOUT', 5.0)),
+                              conn_log=log_file, response_log=output_file)
 
         # TODO: add hook to replace the test request, e.g. for curl

test/test-28_HTTP2_support.bash

@@ -4 +4 @@
 
 set -e
-: ${srcdir:="."}
-. ${srcdir}/common.bash
-netns_reexec ${@}
-
-testdir="${srcdir}/tests/28_HTTP2_support"
-TEST_NAME="$(basename ${testdir})"
-. $(dirname ${0})/apache_service.bash
 
 if [ ! -r ${AP_LIBEXECDIR}/mod_http2.so ]; then
@@ -21 +14 @@
 fi
 
-function stop_server
-{
-    apache_service "${testdir}" "apache.conf" stop
-}
-apache_service "${testdir}" "apache.conf" start "${TEST_LOCK}"
-trap stop_server EXIT
+# expected output files
+log="outputs/28_HTTP2_support.log"
+output="outputs/28_HTTP2_support.output"
 
-output="outputs/${TEST_NAME}.output"
-header="outputs/${TEST_NAME}.header"
-rm -f "${output}" "${header}"
-
-URL="https://${TEST_HOST}:${TEST_PORT}/status?auto"
-${HTTP_CLI} --http2 --location --verbose --cacert authority/x509.pem \
-            --dump-header "${header}" --output "${output}" "${URL}"
+${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 28 \
+         --log-connection "${log}" --log-responses "${output}"
 
 echo "Checking for HTTP/2 in logged header:"
-grep "HTTP/2 200" "${header}"
+grep "HTTP/2 200" "${log}"
 echo "Checking for TLS session status:"
 grep "Current TLS session: (TLS" "${output}"
-
-apache_service "${testdir}" "apache.conf" stop
-trap - EXIT

test/tests/Makefile.am

@@ -28 +28 @@
         26_redirect_HTTP_to_HTTPS/apache.conf 26_redirect_HTTP_to_HTTPS/test.yml \
         27_OCSP_server/apache.conf 27_OCSP_server/ocsp.conf 27_OCSP_server/test.yml \
-        28_HTTP2_support/apache.conf \
+        28_HTTP2_support/apache.conf 28_HTTP2_support/hooks.py \
         29_force_handshake_vhost/apache.conf 29_force_handshake_vhost/test.yml \
         30_ip_based_vhosts/apache.conf 30_ip_based_vhosts/test.yml \