diff options
| author | slavomir.katuscak%sun.com <devnull@localhost> | 2009-04-20 14:30:54 +0000 |
|---|---|---|
| committer | slavomir.katuscak%sun.com <devnull@localhost> | 2009-04-20 14:30:54 +0000 |
| commit | 606c6abef553168fc8af1eb4260bc1de1ed1fc27 (patch) | |
| tree | 4f552145771a3d8f7d1fa264f53a530ec5feac41 | |
| parent | 4e042517c0282569a1c6cafc3e11587e617c555a (diff) | |
| download | nss-hg-606c6abef553168fc8af1eb4260bc1de1ed1fc27.tar.gz | |
Bug 470479: Added checking on error output and also checking for error 8030. r=alexei
| -rw-r--r-- | security/nss/tests/chains/chains.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/security/nss/tests/chains/chains.sh b/security/nss/tests/chains/chains.sh index 949905d3b..99213f92a 100644 --- a/security/nss/tests/chains/chains.sh +++ b/security/nss/tests/chains/chains.sh @@ -668,7 +668,7 @@ verify_cert() echo "vfychain ${DB_OPT} -pp -vv ${REV_OPTS} ${FETCH_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT}" if [ -z "${MEMLEAK_DBG}" ]; then - VFY_OUT=$(${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} 2>&1) RESULT=$? echo "${VFY_OUT}" else @@ -678,7 +678,11 @@ verify_cert() fi echo "${VFY_OUT}" | grep "ERROR -5990: I/O operation timed out" > /dev/null - if [ $? -eq 0 ]; then + E5990=$? + echo "${VFY_OUT}" | grep "ERROR -8030: Server returned bad HTTP response" > /dev/null + E8030=$? + + if [ $E5990 -eq 0 -o $E8030 -eq 0 ]; then echo "Result of this test is not valid due to network time out." html_unknown "${SCENARIO}${TESTNAME}" return |