summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2023-01-17 10:15:10 +0000
committerDamien Miller <djm@mindrot.org>2023-01-17 21:16:06 +1100
commit12492c0abf1eb415d08a897cc1d8b9e789888230 (patch)
treeff6f2fefa4144276657637c9aa91ccbcca2a5b34
parentcef2593c33ac46a58238ff998818754eabdf64ff (diff)
upstream: also check that an active session inhibits
UnusedConnectionTimeout idea markus@ OpenBSD-Regress-ID: 55c0fb61f3bf9e092b0a53f9041d3d2012f14003
-rw-r--r--regress/connection-timeout.sh15
1 files changed, 11 insertions, 4 deletions
diff --git a/regress/connection-timeout.sh b/regress/connection-timeout.sh
index adaf8bab..6c0c0b22 100644
--- a/regress/connection-timeout.sh
+++ b/regress/connection-timeout.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: connection-timeout.sh,v 1.1 2023/01/17 10:02:34 djm Exp $
+# $OpenBSD: connection-timeout.sh,v 1.2 2023/01/17 10:15:10 djm Exp $
# Placed in the Public Domain.
tid="unused connection timeout"
@@ -58,10 +58,17 @@ sleep 8
check_ssh && fail "ssh unexpectedly present"
stop_ssh
-verbose "timeout after session"
+verbose "session inhibits timeout"
+rm -f $OBJ/copy.1
start_ssh
-${REAL_SSH} -qoControlPath=$CTL -oControlMaster=no -Fnone somehost "exit 0" ||
- fail "session failed"
+${REAL_SSH} -qoControlPath=$CTL -oControlMaster=no -Fnone somehost \
+ "sleep 8; touch $OBJ/copy.1" &
+check_ssh || fail "ssh unexpectedly missing"
+wait
+test -f $OBJ/copy.1 || fail "missing result file"
+
+verbose "timeout after session"
+# Session should still be running from previous
sleep 8
check_ssh && fail "ssh unexpectedly present"
stop_ssh