diff options
| author | Damien Miller <djm@mindrot.org> | 2014-07-22 03:31:47 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-07-22 03:31:47 +0200 |
| commit | 04f4824940ea3edd60835416ececbae16438968a (patch) | |
| tree | 926e69c9a6c6900039ed7065b22d1c4f3d1c4b58 /regress/multiplex.sh | |
| parent | - (djm) [regress/multiplex.sh] ssh mux master lost -N somehow; (diff) | |
| download | openssh-04f4824940ea3edd60835416ececbae16438968a.tar.xz openssh-04f4824940ea3edd60835416ececbae16438968a.zip | |
- (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.sh | 4 |
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 \ || fail "connect to local forward path failed" ${SSH} -F $OBJ/ssh_config -S $CTL -Ocancel -L $OBJ/unix-1.fwd:localhost:$PORT otherhost \ || fail "cancel local forward failed" -N=$(echo "" | $NC -U $OBJ/unix-1.fwd 2>&1 | wc -l) +N=$(echo "xyzzy" | $NC -U $OBJ/unix-1.fwd 2>&1 | grep "xyzzy" | wc -l) test ${N} -eq 0 || fail "local forward path still listening" rm -f $OBJ/unix-1.fwd @@ -166,7 +166,7 @@ echo "" | $NC -U $OBJ/unix-1.fwd | grep "Protocol mismatch" >/dev/null 2>&1 \ ${SSH} -F $OBJ/ssh_config -S $CTL -Ocancel -R $OBJ/unix-1.fwd:localhost:$PORT otherhost \ || fail "cancel remote forward failed" N=$(echo "" | $NC -U $OBJ/unix-1.fwd 2>&1 | wc -l) -test ${N} -eq 0 || fail "remote forward path still listening" +N=$(echo "xyzzy" | $NC -U $OBJ/unix-1.fwd 2>&1 | grep "xyzzy" | wc -l) rm -f $OBJ/unix-1.fwd verbose "test $tid: cmd exit" |