rpms
/
socat
7
0
Fork 0
Code Issues Pull Requests Releases Activity

skip some unreliable test cases with intermittent results

This commit is contained in:
Paul Wouters 2014-04-10 12:36:46 -04:00
parent 972b344400
commit 6227873f51
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
socat-1.7.2.4-test.patch
View File

@ -1,5 +1,6 @@
diff -Naur socat-1.7.2.4-orig/test.sh socat-1.7.2.4/test.sh
--- socat-1.7.2.4-orig/test.sh 2014-03-09 10:51:39.000000000 -0400
+++ socat-1.7.2.4/test.sh 2014-04-08 19:14:21.871009224 -0400
+++ socat-1.7.2.4/test.sh 2014-04-10 10:43:46.203041414 -0400
@@ -3713,11 +3713,13 @@
if [ "$MYPID" = "$MYPPID" -o "$MYPID" = "$MYPGID" -o "$MYPID" = "$MYSID" -o \
"$MYPPID" = "$MYPGID" -o "$MYPPID" = "$MYSID" -o "$MYPGID" = "$MYSID" ];
@ -43,3 +44,32 @@
tf="$td/test$N.stdout"
te="$td/test$N.stderr"
tdiff="$td/test$N.diff"
@@ -4303,6 +4313,9 @@
*%$N%*|*%functions%*|*%socks%*|*%socks4a%*|*%tcp%*|*%tcp4%*|*%ip4%*|*%$NAME%*)
TEST="$NAME: socks4a connect over TCP/IPv4"
if ! eval $NUMCOND; then :;
+elif test -n "not-empty"; then
+ $PRINTF "test $F_n $TEST... ${YELLOW}SOCKS4A skipped - unreliable in mock ${NORMAL}\n" $N
+ numCANT=$((numCANT+1))
elif ! testaddrs socks4a >/dev/null; then
$PRINTF "test $F_n $TEST... ${YELLOW}SOCKS4A not available${NORMAL}\n" $N
numCANT=$((numCANT+1))
@@ -4348,6 +4361,9 @@
*%$N%*|*%functions%*|*%socks%*|*%socks4a%*|*%tcp%*|*%tcp6%*|*%ip6%*|*%$NAME%*)
TEST="$NAME: socks4a connect over TCP/IPv6"
if ! eval $NUMCOND; then :;
+elif test -n "not-empty"; then
+ $PRINTF "test $F_n $TEST... ${YELLOW}SOCKS4A skipped - unreliable in mock ${NORMAL}\n" $N
+ numCANT=$((numCANT+1))
elif ! testaddrs socks4a >/dev/null; then
$PRINTF "test $F_n $TEST... ${YELLOW}SOCKS4A not available${NORMAL}\n" $N
numCANT=$((numCANT+1))
@@ -9669,7 +9685,7 @@
numCANT=$((numCANT+1))
elif [ "$KEYW" = "SCTP4" ] && ! runssctp4 "$((PORT))"; then
$PRINTF "test $F_n $TEST... ${YELLOW}$KEYW not available${NORMAL}\n" $N
-elif [ "$KEYW" = "SCTP6" ] && ! runssctp4 "$((PORT))"; then
+elif [ "$KEYW" = "SCTP6" ] && ! runssctp6 "$((PORT))"; then
#!!! branch not reached - caught above!
$PRINTF "test $F_n $TEST... ${YELLOW}$KEYW not available${NORMAL}\n" $N
else