Changeset 905063e in mod_gnutls for test/tests/16_view-status/hooks.py

Timestamp:

Jan 3, 2020, 5:08:56 AM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

f246f00

Parents:

0f65ea9

Message:

Simplify 16_view-status post_check hook using mgstest.require_match()

File:

• test/tests/16_view-status/hooks.py (modified) (2 diffs)

test/tests/16_view-status/hooks.py

@@ -1 @@
-from mgstest import first_line_match, TestExpectationFailed
+from mgstest import require_match, TestExpectationFailed
 import re
 
@@ -16 +16 @@
     re_status = re.compile('(?<=^Current TLS session:\s)' + re_session + '$')
 
-    cli_suite = first_line_match(re_cli, conn_log)
-    if not cli_suite:
-        raise TestExpectationFailed(
-            'Client cipher suite information is missing!')
-    status_suite = first_line_match(re_status, response_log)
-    if not status_suite:
-        raise TestExpectationFailed(
-            'Server cipher suite information is missing!')
+    cli_suite = require_match(re_cli, conn_log,
+                              'Client cipher suite information is missing!')
+    status_suite = require_match(re_status, response_log,
+                                 'Server cipher suite information is missing!')
 
     print(f'Client session info: {cli_suite.group(0)}')