Changeset 0f65ea9 in mod_gnutls

Timestamp:

Jan 3, 2020, 5:05:34 AM (3 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master

Children:

905063e

Parents:

076049a

Message:

Use post_check hook in 28_HTTP2_support

Location:

test

Files:

• mgstest/__init__.py (modified) (2 diffs)
• test-28_HTTP2_support.bash (modified) (1 diff)
• tests/28_HTTP2_support/hooks.py (modified) (2 diffs)

test/mgstest/__init__.py

@@ -1 +1 @@
 #!/usr/bin/python3
 
-# Copyright 2019 Fiona Klute
+# Copyright 2019-2020 Fiona Klute
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -67 +67 @@
             return m
     return None
+
+
+
+def require_match(regexp, file, error_message=None):
+    """Return the first match of the regular expression in file (by line),
+    or raise TestExpectationFailed.
+
+    If error_message is not None the exception message will be that
+    string, otherwise a generic message containing the regular
+    expression pattern. Technically applicable to any iterable
+    containing strings, not just files opened for reading.
+
+    """
+    m = first_line_match(regexp, file)
+    if m:
+        return m
+
+    if error_message:
+        raise TestExpectationFailed(error_message)
+    else:
+        raise TestExpectationFailed(f'No match found for {regexp.pattern}!')

test/test-28_HTTP2_support.bash

@@ -14 +14 @@
 fi
 
-# expected output files
-log="outputs/28_HTTP2_support.log"
-output="outputs/28_HTTP2_support.output"
-
-${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" "${log}"
-echo "Checking for TLS session status:"
-grep "Current TLS session: (TLS" "${output}"
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 28

test/tests/28_HTTP2_support/hooks.py

@@ -1 +1 @@
 import os
+import re
 import subprocess
+from mgstest import require_match
 
 def run_connection(testname, conn_log, response_log):
@@ -15 +17 @@
     print(proc.stdout)
     print(proc.stdout, file=response_log)
+
+def post_check(conn_log, response_log):
+    print('Checking for HTTP/2 in logged header:')
+    print(require_match(re.compile(r'\bHTTP/2 200\b'), conn_log).group(0))
+    print('Checking for TLS session status:')
+    print(require_match(re.compile(r'^Current TLS session:\s\(TLS.*$'),
+                        response_log)
+          .group(0))