Changeset 43a601f in mod_gnutls

Timestamp:

Aug 14, 2020, 4:47:21 PM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, main, master

Children:

ec26b87

Parents:

e080eef

Message:

Proxy resume test: Allow initial close/resume open to interleave

Almost always closing the initial connection is logged before
resumption, but "almost" is not enough for a reliable test. Either way
the messages are just a few milliseconds apart on my system.

Instead the test now matches the resume and open messages for the
resume session by handler thread ID to increase reliability.

File:

• test/tests/37_TLS_reverse_proxy_resume_session/hooks.py (modified) (3 diffs)

test/tests/37_TLS_reverse_proxy_resume_session/hooks.py

@@ -1 +1 @@
 import re
-from mgstest import require_match
+from mgstest import require_match, TestExpectationFailed
 from pathlib import Path
 
@@ -16 +16 @@
 
 def post_check(conn_log, response_log):
-    conn_opened = re.compile(r'TLS connection opened.')
-    conn_closed = re.compile(r'TLS connection closed.')
-    session_resumed = re.compile(r'TLS session resumed.')
+    conn_opened = re.compile(r'tid (\d+)\].* TLS connection opened.')
+    session_resumed = re.compile(r'tid (\d+)\].* TLS session resumed.')
 
     print('Checking if the backend server log contains session resumption')
@@ -26 +25 @@
 
         require_match(conn_opened, log)
-        require_match(conn_closed, log)
         print('Initial session found.')
 
-        require_match(session_resumed, log)
-        require_match(conn_opened, log)
-        require_match(conn_closed, log)
+        id1 = require_match(session_resumed, log).group(1)
+        id2 = require_match(conn_opened, log).group(1)
+        if id1 != id2:
+            raise TestExpectationFailed(
+                'thread ID mismatch between resume and open message: '
+                f'{id1} != {id2}')
         print('Resumed session found.')