File bmo1962556.patch of Package mozilla-nss
commit ae5fe2c5652185fe58f9a7bb97486388f84ad5f9
Author: Dennis Jackson <djackson@mozilla.com>
Date: Tue Apr 29 08:07:21 2025 +0000
Bug 1962556 - Tolerate intermittent failures in ssl_policy_pkix_ocsp. r=nss-reviewers,jschanck
Differential Revision: https://phabricator.services.mozilla.com/D246682
NOTE(Martin Sirringhaus): We get a different error code in OBS:
PR_DIRECTORY_LOOKUP_ERROR (-5973L)
instead of
PR_CONNECT_RESET_ERROR (-5961L)
so I modified the upstreamed patch to grep for both
diff --git a/tests/ssl/ssl.sh b/tests/ssl/ssl.sh
index cd03bbcb4c..3030ea2c4f 100755
--- a/tests/ssl/ssl.sh
+++ b/tests/ssl/ssl.sh
@@ -982,8 +982,8 @@ ssl_policy_pkix_ocsp()
echo " vfyserv -o wrong.host.badssl.com -d ${P_R_SERVERDIR} 2>&1 | tee ${P_R_SERVERDIR}/vfy.out"
vfyserv -o wrong.host.badssl.com -d ${P_R_SERVERDIR} 2>&1 | tee ${P_R_SERVERDIR}/vfy.out
# make sure we have the domain mismatch, not bad signature error
- echo "grep 12276 ${P_R_SERVERDIR}/vfy.out"
- grep 12276 ${P_R_SERVERDIR}/vfy.out
+ echo "grep -E '12276|5961|5973' ${P_R_SERVERDIR}/vfy.out"
+ grep -E '12276|5961|5973' ${P_R_SERVERDIR}/vfy.out
RET=$?
html_msg $RET $RET_EXP "${testname}" \
"produced a returncode of $RET, expected is $RET_EXP"
@@ -1023,12 +1023,12 @@ ssl_policy_selfserv()
SAVE_SERVER_OPTIONS=${SERVER_OPTIONS}
# make sure policy is working in the multiprocess case is working on
# UNIX-like OS's. Other OS's can't properly clean up the child processes
- # when our test suite kills the parent, so just use the single process
+ # when our test suite kills the parent, so just use the single process
# self serve for them
# if [ "${OS_ARCH}" != "WINNT" ]; then
# SERVER_OPTIONS="-M 3 ${SERVER_OPTIONS}"
# fi
-
+
start_selfserv $CIPHER_SUITES
SERVER_OPTIONS="${SAVE_SERVER_OPTIONS}"