summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-07-25 12:08:46 +1000
committerDamien Miller <djm@mindrot.org>2013-07-25 12:08:46 +1000
commit78d47b7c5b182e44552913de2b4b7e0363c8e3cc (patch)
treea7b6ba7e29dc87ada0f1b1c561201d4234f80bc2
parentfea440639e04cea9f2605375a41d654390369402 (diff)
- dtucker@cvs.openbsd.org 2013/06/10 21:56:43
[regress/forwarding.sh] Add test for forward config parsing
-rw-r--r--ChangeLog3
-rw-r--r--regress/forwarding.sh17
2 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5daedfa43..841988bb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@
26 - dtucker@cvs.openbsd.org 2013/05/30 20:12:32 26 - dtucker@cvs.openbsd.org 2013/05/30 20:12:32
27 [regress/test-exec.sh] 27 [regress/test-exec.sh]
28 use ssh and sshd as testdata since it needs to be >256k for the rekey test 28 use ssh and sshd as testdata since it needs to be >256k for the rekey test
29 - dtucker@cvs.openbsd.org 2013/06/10 21:56:43
30 [regress/forwarding.sh]
31 Add test for forward config parsing
29 32
3020130720 3320130720
31 - (djm) OpenBSD CVS Sync 34 - (djm) OpenBSD CVS Sync
diff --git a/regress/forwarding.sh b/regress/forwarding.sh
index 1c408603c..ca48b40af 100644
--- a/regress/forwarding.sh
+++ b/regress/forwarding.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: forwarding.sh,v 1.10 2013/05/17 04:29:14 dtucker Exp $ 1# $OpenBSD: forwarding.sh,v 1.11 2013/06/10 21:56:43 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="local and remote forwarding" 4tid="local and remote forwarding"
@@ -104,3 +104,18 @@ for p in 2; do
104 fail "stdio forwarding proto $p" 104 fail "stdio forwarding proto $p"
105 fi 105 fi
106done 106done
107
108echo "LocalForward ${base}01 127.0.0.1:$PORT" >> ssh_config
109echo "RemoteForward ${base}02 127.0.0.1:${base}01" >> ssh_config
110for p in 1 2; do
111 trace "config file: start forwarding, fork to background"
112 ${SSH} -$p -F $OBJ/ssh_config -f somehost sleep 10
113
114 trace "config file: transfer over forwarded channels and check result"
115 ${SSH} -F $OBJ/ssh_config -p${base}02 -o 'ConnectionAttempts=4' \
116 somehost cat ${DATA} > ${COPY}
117 test -f ${COPY} || fail "failed copy of ${DATA}"
118 cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}"
119
120 wait
121done