Changeset 2d25c1c in mod_gnutls for test

Timestamp:

Dec 28, 2019, 6:32:02 AM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

079859e

Parents:

dd91d9c

Message:

Test 16_view-status: Use post_check hook for GnuTLS 3.6.11 compatibility

Since 3.6.11 GnuTLS lists the certificate type used for authentication
in the TLS session information. In most tests (including this one) the
client does not authenticate, so the strings aren't exactly
equivalent. The new hook takes this into consideration.

Location:

test

Files:

• mgstest/__init__.py (modified) (1 diff)
• test-16_view-status.bash (modified) (1 diff)
• tests/16_view-status/hooks.py (added)

test/mgstest/__init__.py

@@ -54 +54 @@
                 fcntl.flock(lockfile, fcntl.LOCK_UN)
                 print(f'Unlocked {file}.', file=sys.stderr)
+
+
+
+def first_line_match(regexp, file):
+    """Return the first match of the regular expression in file (by line),
+    or None. Technically applicable to any iterable containing
+    strings, not just files opened for reading.
+    """
+    for line in file:
+        m = regexp.search(line)
+        if m:
+            return m
+    return None

test/test-16_view-status.bash

@@ -2 +2 @@
 set -e
 
-# expected output files
+# output files, needed for post_check hook
 log="outputs/16_view-status.log"
 output="outputs/16_view-status.output"
 
-${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 16 \
-         --log-connection "${log}" --log-responses "${output}"
-
-# get the cipher suite reported by gnutls-cli
-cli_suite="$(grep -o -P '(?<=^-\sDescription:\s).*$' "${log}")" || true
-# extract cipher suite from the server status output
-status_suite="$(grep -o -P '(?<=^Current TLS session:\s).*$' "${output}")" \
-    || true
-
-echo
-if [[ -n "${cli_suite}" && "${status_suite}" = "${cli_suite}" ]]; then
-    echo "Server and client report matching cipher suite: ${status_suite}"
-else
-    echo "ERROR: Cipher suites mismatching or missing!"
-    echo "Server: '${status_suite}'"
-    echo "Client: '${cli_suite}'"
-    exit 1
-fi
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 16 \
+        --log-connection "${log}" --log-responses "${output}"