diff options
author | Colin Watson <cjwatson@debian.org> | 2019-06-05 06:41:44 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2019-06-09 22:09:07 +0100 |
commit | 865a97e05b6aab1619e1c8eeb33ccb8f9a9e48d3 (patch) | |
tree | 7bb2128eb663180bacfabca88f26d26bf0733824 /regress/agent-timeout.sh | |
parent | ba627ba172d6649919baedff5ba2789610da382a (diff) | |
parent | 7d50f9e5be88179325983a1f58c9d51bb58f025a (diff) |
New upstream release (8.0p1)
Diffstat (limited to 'regress/agent-timeout.sh')
-rw-r--r-- | regress/agent-timeout.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/regress/agent-timeout.sh b/regress/agent-timeout.sh index 9598c2032..80012f80c 100644 --- a/regress/agent-timeout.sh +++ b/regress/agent-timeout.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: agent-timeout.sh,v 1.3 2015/03/03 22:35:19 markus Exp $ | 1 | # $OpenBSD: agent-timeout.sh,v 1.4 2019/01/28 00:08:26 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="agent timeout test" | 4 | tid="agent timeout test" |
@@ -12,16 +12,18 @@ if [ $r -ne 0 ]; then | |||
12 | fail "could not start ssh-agent: exit code $r" | 12 | fail "could not start ssh-agent: exit code $r" |
13 | else | 13 | else |
14 | trace "add keys with timeout" | 14 | trace "add keys with timeout" |
15 | keys=0 | ||
15 | for t in ${SSH_KEYTYPES}; do | 16 | for t in ${SSH_KEYTYPES}; do |
16 | ${SSHADD} -t ${SSHAGENT_TIMEOUT} $OBJ/$t > /dev/null 2>&1 | 17 | ${SSHADD} -t ${SSHAGENT_TIMEOUT} $OBJ/$t > /dev/null 2>&1 |
17 | if [ $? -ne 0 ]; then | 18 | if [ $? -ne 0 ]; then |
18 | fail "ssh-add did succeed exit code 0" | 19 | fail "ssh-add did succeed exit code 0" |
19 | fi | 20 | fi |
21 | keys=$((${keys} + 1)) | ||
20 | done | 22 | done |
21 | n=`${SSHADD} -l 2> /dev/null | wc -l` | 23 | n=`${SSHADD} -l 2> /dev/null | wc -l` |
22 | trace "agent has $n keys" | 24 | trace "agent has $n keys" |
23 | if [ $n -ne 2 ]; then | 25 | if [ $n -ne $keys ]; then |
24 | fail "ssh-add -l did not return 2 keys: $n" | 26 | fail "ssh-add -l did not return $keys keys: $n" |
25 | fi | 27 | fi |
26 | trace "sleeping 2*${SSHAGENT_TIMEOUT} seconds" | 28 | trace "sleeping 2*${SSHAGENT_TIMEOUT} seconds" |
27 | sleep ${SSHAGENT_TIMEOUT} | 29 | sleep ${SSHAGENT_TIMEOUT} |