From ea346bed416371446c4a90c427341d01e014cf9a Mon Sep 17 00:00:00 2001
From: "slavomir.katuscak%sun.com"
 <slavomir.katuscak%sun.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 18 Mar 2009 12:46:42 +0000
Subject: [PATCH] Bug 470479: Patch to valid IO timeout as unknown status.
 r=alexei

git-svn-id: svn://10.0.0.236/trunk@256575 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/security/nss/tests/chains/chains.sh | 22 ++++++++++++++++-----
 mozilla/security/nss/tests/common/init.sh   | 10 ++++++++++
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/mozilla/security/nss/tests/chains/chains.sh b/mozilla/security/nss/tests/chains/chains.sh
index eeae0ce56ca..85bc60540df 100644
--- a/mozilla/security/nss/tests/chains/chains.sh
+++ b/mozilla/security/nss/tests/chains/chains.sh
@@ -373,7 +373,7 @@ ${NSS_AIA_HTTP}/${CERT_PUBLIC}
 "
 
             if [ -n "${NSS_AIA_PATH}" ]; then
-                cp ${CERT_LOCAL} ${NSS_AIA_PATH}/${CERT_PUBLIC}
+                cp ${CERT_LOCAL} ${NSS_AIA_PATH}/${CERT_PUBLIC} 2> /dev/null
                 chmod a+r ${NSS_AIA_PATH}/${CERT_PUBLIC}
                 echo ${NSS_AIA_PATH}/${CERT_PUBLIC} >> ${AIA_FILES}
             fi
@@ -517,7 +517,7 @@ import_cert()
     IS_ASCII=`grep -c -- "-----BEGIN CERTIFICATE-----" ${CERT_FILE}`
 
     ASCII_OPT=
-    if [ ${IS_ASCII} -gt 0 ]; then
+    if [ "${IS_ASCII}" -gt 0 ]; then
         ASCII_OPT="-a"
     fi
    
@@ -668,11 +668,20 @@ verify_cert()
     echo "vfychain ${DB_OPT} -pp -vv ${REV_OPTS} ${FETCH_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT}"
 
     if [ -z "${MEMLEAK_DBG}" ]; then
-        ${BINDIR}/vfychain ${DB_OPT} -pp -vv ${REV_OPTS} ${FETCH_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT} 
+        VFY_OUT=$(${BINDIR}/vfychain ${DB_OPT} -pp -vv ${REV_OPTS} ${FETCH_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT})
         RESULT=$?
+        echo "${VFY_OUT}"
     else 
-        ${RUN_COMMAND_DBG} ${BINDIR}/vfychain ${REV_OPTS} ${DB_OPT} -pp -vv ${FETCH_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT} 2>> ${LOGFILE}
+        VFY_OUT=$(${RUN_COMMAND_DBG} ${BINDIR}/vfychain ${REV_OPTS} ${DB_OPT} -pp -vv ${FETCH_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT} 2>> ${LOGFILE})
         RESULT=$?
+        echo "${VFY_OUT}"
+    fi
+
+    echo "${VFY_OUT}" | grep "ERROR -5990: I/O operation timed out" > /dev/null
+    if [ $? -eq 0 ]; then
+        echo "Result of this test is not valid due to network time out."
+        html_unknown "${SCENARIO}${TESTNAME}"
+        return
     fi
 
     echo "Returned value is ${RESULT}, expected result is ${EXP_RESULT}"
@@ -850,6 +859,9 @@ parse_config()
                 LOGFILE="${LOGDIR}/${LOGNAME}"
             fi
             ;;
+        "sleep")
+            sleep ${VALUE}
+            ;;
         "break")
             break
             ;;
@@ -903,7 +915,7 @@ chains_main()
 
         while read AIA_FILE
         do
-            rm ${AIA_FILE} 
+            rm ${AIA_FILE} 2> /dev/null
         done < ${AIA_FILES}
         rm ${AIA_FILES}
     done < "${CHAINS_SCENARIOS}"
diff --git a/mozilla/security/nss/tests/common/init.sh b/mozilla/security/nss/tests/common/init.sh
index 903d628657d..58263c78f24 100644
--- a/mozilla/security/nss/tests/common/init.sh
+++ b/mozilla/security/nss/tests/common/init.sh
@@ -224,6 +224,15 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then
         html "<TR><TD>#${MSG_ID}: $1 ${HTML_FAILED}"
         echo "${SCRIPTNAME}: #${MSG_ID}: $* - FAILED"
     }
+    html_unknown()
+    {
+        html_detect_core "$@" || return
+        MSG_ID=`cat ${MSG_ID_FILE}`
+        MSG_ID=`expr ${MSG_ID} + 1`
+        echo ${MSG_ID} > ${MSG_ID_FILE}
+        html "<TR><TD>#${MSG_ID}: $1 ${HTML_UNKNOWN}"
+        echo "${SCRIPTNAME}: #${MSG_ID}: $* - UNKNOWN"
+    }
     html_detect_core()
     {
         detect_core
@@ -255,6 +264,7 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then
     HTML_FAILED='</TD><TD bgcolor=red>Failed</TD><TR>'
     HTML_FAILED_CORE='</TD><TD bgcolor=red>Failed Core</TD><TR>'
     HTML_PASSED='</TD><TD bgcolor=lightGreen>Passed</TD><TR>'
+    HTML_UNKNOWN='</TD><TD>Unknown/TD><TR>'
     TABLE_ARGS=