From: Rainer Jung <rjung@apache.org>
Date: Mon, 11 Jul 2022 14:06:29 +0000 (+0000)
Subject: Make pytest error whitelist a bit more explicit
X-Git-Tag: 2.4.55-rc1-candidate~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa4c3833b6658691a771ed2bd50db587bf9550bc;p=thirdparty%2Fapache%2Fhttpd.git

Make pytest error whitelist a bit more explicit
and add OSSL 3 variants.

This fixes an error in test_101_ssl_reneg.py
due to the function name no longer being part
of the error message log when we use OSSL 3.

Backport of r1902660 and partial backport
of r1897257.

pytest is probably CTR, though not mentioned
in the CTR list in STATUS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1902661 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/modules/http2/env.py b/test/modules/http2/env.py
index a839a040e69..a5ff2cf52f1 100644
--- a/test/modules/http2/env.py
+++ b/test/modules/http2/env.py
@@ -91,7 +91,13 @@ class H2TestEnv(HttpdTestEnv):
         self.httpd_error_log.add_ignored_patterns([
             re.compile(r'.*malformed header from script \'hecho.py\': Bad header: x.*'),
             re.compile(r'.*:tls_post_process_client_hello:.*'),
+            # OSSL 3 dropped the function name from the error description. Use the code instead:
+            # 0A0000C1 = no shared cipher -- Too restrictive SSLCipherSuite or using DSA server certificate?
+            re.compile(r'.*SSL Library Error: error:0A0000C1:.*'),
             re.compile(r'.*:tls_process_client_certificate:.*'),
+            # OSSL 3 dropped the function name from the error description. Use the code instead:
+            # 0A0000C7 = peer did not return a certificate -- No CAs known to server for verification?
+            re.compile(r'.*SSL Library Error: error:0A0000C7:.*'),
             re.compile(r'.*have incompatible TLS configurations.'),
         ])