From 0240e7a160721a53365aaa3bd10bb6f3de3f9f15 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 21 Jan 2021 13:06:31 +0000 Subject: Testsuite: TLS server testcase consolidation --- test/runtest | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'test/runtest') diff --git a/test/runtest b/test/runtest index 323472634..ba2450c45 100755 --- a/test/runtest +++ b/test/runtest @@ -1490,7 +1490,10 @@ RESET_AFTER_EXTRA_LINE_READ: # Platform differences in errno strings s/Arg list too long/Argument list too long/; - s/session: \((SSL_connect|gnutls_handshake)\): timed out/session: (tls lib connect fn): timed out/; + # OpenSSL vs. GnuTLS + s/session: \K\((SSL_connect|gnutls_handshake)\): timed out/(tls lib connect fn): timed out/; + s/TLS error on connection from .*\K\((SSL_accept|gnutls_handshake)\): timed out/(tls lib accept fn): timed out/; + s/TLS error on connection from .*\K(SSL_accept: TCP connection closed by peer|\(gnutls_handshake\): The TLS connection was non-properly terminated.)/(tls lib accept fn): TCP connection closed by peer/; } # ======== mail ======== -- cgit v1.2.3