summaryrefslogtreecommitdiff
path: root/regress/multiplex.sh
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-07-22 11:31:47 +1000
committerDamien Miller <djm@mindrot.org>2014-07-22 11:31:47 +1000
commit04f4824940ea3edd60835416ececbae16438968a (patch)
tree926e69c9a6c6900039ed7065b22d1c4f3d1c4b58 /regress/multiplex.sh
parent5ea4fe00d55453aaa44007330bb4c3181bd9b796 (diff)
- (djm) [regress/multiplex.sh] change the test for still-open Unix
domain sockets to be robust against nc implementations that produce error messages.
Diffstat (limited to 'regress/multiplex.sh')
-rw-r--r--regress/multiplex.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index cc52f4348..16bb5042f 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -154,7 +154,7 @@ echo "" | $NC -U $OBJ/unix-1.fwd | grep "Protocol mismatch" >/dev/null 2>&1 \
154 || fail "connect to local forward path failed" 154 || fail "connect to local forward path failed"
155${SSH} -F $OBJ/ssh_config -S $CTL -Ocancel -L $OBJ/unix-1.fwd:localhost:$PORT otherhost \ 155${SSH} -F $OBJ/ssh_config -S $CTL -Ocancel -L $OBJ/unix-1.fwd:localhost:$PORT otherhost \
156 || fail "cancel local forward failed" 156 || fail "cancel local forward failed"
157N=$(echo "" | $NC -U $OBJ/unix-1.fwd 2>&1 | wc -l) 157N=$(echo "xyzzy" | $NC -U $OBJ/unix-1.fwd 2>&1 | grep "xyzzy" | wc -l)
158test ${N} -eq 0 || fail "local forward path still listening" 158test ${N} -eq 0 || fail "local forward path still listening"
159rm -f $OBJ/unix-1.fwd 159rm -f $OBJ/unix-1.fwd
160 160
@@ -166,7 +166,7 @@ echo "" | $NC -U $OBJ/unix-1.fwd | grep "Protocol mismatch" >/dev/null 2>&1 \
166${SSH} -F $OBJ/ssh_config -S $CTL -Ocancel -R $OBJ/unix-1.fwd:localhost:$PORT otherhost \ 166${SSH} -F $OBJ/ssh_config -S $CTL -Ocancel -R $OBJ/unix-1.fwd:localhost:$PORT otherhost \
167 || fail "cancel remote forward failed" 167 || fail "cancel remote forward failed"
168N=$(echo "" | $NC -U $OBJ/unix-1.fwd 2>&1 | wc -l) 168N=$(echo "" | $NC -U $OBJ/unix-1.fwd 2>&1 | wc -l)
169test ${N} -eq 0 || fail "remote forward path still listening" 169N=$(echo "xyzzy" | $NC -U $OBJ/unix-1.fwd 2>&1 | grep "xyzzy" | wc -l)
170rm -f $OBJ/unix-1.fwd 170rm -f $OBJ/unix-1.fwd
171 171
172verbose "test $tid: cmd exit" 172verbose "test $tid: cmd exit"