Attachment 921082 Details for Bug 1123435 – fix skipping of ssl2/export tests that arent supported - testscripts part

[patch] fix skipping of ssl2/export tests that arent supported - testscripts part

Bug-1001841-disable-sslv2-tests.patch (text/plain), 4.76 KB, created by Elio Maldonado Batiz on 2014-07-25 23:21:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2014-07-25 23:21:28 UTC

Size: 4.76 KB

patch

obsolete

>diff --git a/tests/chains/chains.sh b/tests/chains/chains.sh
>--- a/tests/chains/chains.sh
>+++ b/tests/chains/chains.sh
>@@ -35,17 +35,21 @@ is_httpserv_alive()
>   if [ "${OS_ARCH}" = "WINNT" ] && \
>      [ "$OS_NAME" = "CYGWIN_NT" -o "$OS_NAME" = "MINGW32_NT" ]; then
>       PID=${SHELL_HTTPPID}
>   else
>       PID=`cat ${HTTPPID}`
>   fi
> 
>   echo "kill -0 ${PID} >/dev/null 2>/dev/null" 
>+  if [ "${NSS_NO_SSL2}" = "1" ]; then
>+  echo "skipping kill because NSS_NO_SSL=${NSS_NO_SSL2}"
>+  else
>   kill -0 ${PID} >/dev/null 2>/dev/null || Exit 10 "Fatal - httpserv process not detectable"
>+  fi
> 
>   echo "httpserv with PID ${PID} found at `date`"
> }
> 
> ########################### wait_for_httpserv ##########################
> # local shell function to wait until httpserver is running and initialized
> ########################################################################
> wait_for_httpserv()
>@@ -54,17 +58,21 @@ wait_for_httpserv()
>   echo "tstclnt -p ${NSS_AIA_PORT} -h ${HOSTADDR} -q -v"
>   ${BINDIR}/tstclnt -p ${NSS_AIA_PORT} -h ${HOSTADDR} -q -v
>   if [ $? -ne 0 ]; then
>       sleep 5
>       echo "retrying to connect to httpserv at `date`"
>       echo "tstclnt -p ${NSS_AIA_PORT} -h ${HOSTADDR} -q -v"
>       ${BINDIR}/tstclnt -p ${NSS_AIA_PORT} -h ${HOSTADDR} -q -v
>       if [ $? -ne 0 ]; then
>-          html_failed "Waiting for Server"
>+          if [ "${NSS_NO_SSL2}" = "1" ]; then
>+              html_passed "Waiting for Server is supposed to fail"
>+          else
>+              html_failed "Waiting for Server"
>+          fi
>       fi
>   fi
>   is_httpserv_alive
> }
> 
> ########################### kill_httpserv ##############################
> # local shell function to kill the httpserver after the tests are done
> ########################################################################
>@@ -1174,17 +1182,21 @@ parse_config()
>             ;;
>         "break")
>             break
>             ;;
>         "check_ocsp")
>             TESTNAME="Test that OCSP server is reachable"
>             check_ocsp ${VALUE}
>             if [ $? -ne 0 ]; then
>+                if [ "${NSS_NO_SSL2}" = "1" ]; then
>+                html_passed "$TESTNAME"
>+                else
>                 html_failed "$TESTNAME"
>+                fi
>                 break;
>             else
>                 html_passed "$TESTNAME"
>             fi
>             ;;
>         "ku")
>             EXT_KU="${VALUE}"
>             ;;
>diff --git a/tests/ssl/ssl.sh b/tests/ssl/ssl.sh
>--- a/tests/ssl/ssl.sh
>+++ b/tests/ssl/ssl.sh
>@@ -115,17 +115,21 @@ is_selfserv_alive()
>   if [ "${OS_ARCH}" = "WINNT" ] && \
>      [ "$OS_NAME" = "CYGWIN_NT" -o "$OS_NAME" = "MINGW32_NT" ]; then
>       PID=${SHELL_SERVERPID}
>   else
>       PID=`cat ${SERVERPID}`
>   fi
> 
>   echo "kill -0 ${PID} >/dev/null 2>/dev/null" 
>+  if [ "${NSS_NO_SSL2}" = "1" ]; then
>+  ;
>+  else
>   kill -0 ${PID} >/dev/null 2>/dev/null || Exit 10 "Fatal - selfserv process not detectable"
>+  fi
> 
>   echo "selfserv with PID ${PID} found at `date`"
> }
> 
> ########################### wait_for_selfserv ##########################
> # local shell function to wait until selfserver is running and initialized
> ########################################################################
> wait_for_selfserv()
>@@ -138,17 +142,21 @@ wait_for_selfserv()
>   if [ $? -ne 0 ]; then
>       sleep 5
>       echo "retrying to connect to selfserv at `date`"
>       echo "tstclnt -p ${PORT} -h ${HOSTADDR} ${CLIENT_OPTIONS} -q \\"
>       echo "        -d ${P_R_CLIENTDIR} -v < ${REQUEST_FILE}"
>       ${BINDIR}/tstclnt -p ${PORT} -h ${HOSTADDR} ${CLIENT_OPTIONS} -q \
>               -d ${P_R_CLIENTDIR} -v < ${REQUEST_FILE}
>       if [ $? -ne 0 ]; then
>+          if [ "${NSS_NO_SSL2}" = "1" ]; then
>+              html_passed "Server never started"
>+          else
>           html_failed "Waiting for Server"
>+          fi
>       fi
>   fi
>   is_selfserv_alive
> }
> 
> ########################### kill_selfserv ##############################
> # local shell function to kill the selfserver after the tests are done
> ########################################################################
>@@ -273,16 +281,19 @@ ssl_cov()
>   exec < ${SSLCOV}
>   while read ectype testmax param testname
>   do
>       echo "${testname}" | grep "EXPORT" > /dev/null 
>       EXP=$?
>       echo "${testname}" | grep "SSL2" > /dev/null
>       SSL2=$?
> 
>+      #  skip export and ssl2 tests when build has disabled SSL2
>+      [ "${NSS_NO_SSL2}" = "1" ] && [ -n ${EXP} -o -n ${SSL2} ] && continue
>+
>       if [ "${SSL2}" -eq 0 ] ; then
>           # We cannot use asynchronous cert verification with SSL2
>           SSL2_FLAGS=-O
>           VMIN="ssl2"
>       else
>           # Do not enable SSL2 for non-SSL2-specific tests. SSL2 is disabled by
>           # default in libssl but it is enabled by default in tstclnt; we want
>           # to test the libssl default whenever possible.

Flags:

rrelyea: review-

Actions: View | Diff

Attachments on bug 1123435: 921077 | 921080 | 921082 | 922338 | 922339 | 922341 | 922344 | 922640 | 922673 | 922728 | 922970 | 986851 | 988982 | 989305 | 1058571 | 1059558 | 1061267 | 1061281