diff options
Diffstat (limited to 'regress/agent-timeout.sh')
-rw-r--r-- | regress/agent-timeout.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/regress/agent-timeout.sh b/regress/agent-timeout.sh index 3a40e7af8..28b1be028 100644 --- a/regress/agent-timeout.sh +++ b/regress/agent-timeout.sh | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | tid="agent timeout test" | 4 | tid="agent timeout test" |
5 | 5 | ||
6 | SSHAGENT_TIMEOUT=10 | 6 | TIMEOUT=5 |
7 | 7 | ||
8 | trace "start agent" | 8 | trace "start agent" |
9 | eval `${SSHAGENT} -s` > /dev/null | 9 | eval `${SSHAGENT} -s` > /dev/null |
@@ -13,7 +13,7 @@ if [ $r -ne 0 ]; then | |||
13 | else | 13 | else |
14 | trace "add keys with timeout" | 14 | trace "add keys with timeout" |
15 | for t in rsa rsa1; do | 15 | for t in rsa rsa1; do |
16 | ${SSHADD} -t ${SSHAGENT_TIMEOUT} $OBJ/$t > /dev/null 2>&1 | 16 | ${SSHADD} -t ${TIMEOUT} $OBJ/$t > /dev/null 2>&1 |
17 | if [ $? -ne 0 ]; then | 17 | if [ $? -ne 0 ]; then |
18 | fail "ssh-add did succeed exit code 0" | 18 | fail "ssh-add did succeed exit code 0" |
19 | fi | 19 | fi |
@@ -23,10 +23,10 @@ else | |||
23 | if [ $n -ne 2 ]; then | 23 | if [ $n -ne 2 ]; then |
24 | fail "ssh-add -l did not return 2 keys: $n" | 24 | fail "ssh-add -l did not return 2 keys: $n" |
25 | fi | 25 | fi |
26 | trace "sleeping 2*${SSHAGENT_TIMEOUT} seconds" | 26 | trace "sleeping 2*${TIMEOUT} seconds" |
27 | sleep ${SSHAGENT_TIMEOUT} | 27 | sleep ${TIMEOUT} |
28 | sleep ${SSHAGENT_TIMEOUT} | 28 | sleep ${TIMEOUT} |
29 | ${SSHADD} -l 2> /dev/null | grep 'The agent has no identities.' >/dev/null | 29 | ${SSHADD} -l 2> /dev/null | grep -q 'The agent has no identities.' |
30 | if [ $? -ne 0 ]; then | 30 | if [ $? -ne 0 ]; then |
31 | fail "ssh-add -l still returns keys after timeout" | 31 | fail "ssh-add -l still returns keys after timeout" |
32 | fi | 32 | fi |