aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/test/ssh_basic_SUITE.erl
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-03-11 12:21:16 +0100
committerFredrik Gustafsson <[email protected]>2013-03-11 12:21:16 +0100
commit5bc09c6e23f05d8e784af8b79f710d97f345c773 (patch)
tree92e6cbd9fdbf0cc2000a03a2c2418f1498da990e /lib/ssh/test/ssh_basic_SUITE.erl
parentd2f2eec4231dbac612303e4d9bc4de52fde20ccc (diff)
parentcda401b58a3db7213eb14197680d401fd1399de9 (diff)
downloadotp-5bc09c6e23f05d8e784af8b79f710d97f345c773.tar.gz
otp-5bc09c6e23f05d8e784af8b79f710d97f345c773.tar.bz2
otp-5bc09c6e23f05d8e784af8b79f710d97f345c773.zip
Merge branch 'maint-r16' into maint
Conflicts: lib/ssh/src/ssh.appup.src lib/ssh/test/ssh_sftp_SUITE.erl
Diffstat (limited to 'lib/ssh/test/ssh_basic_SUITE.erl')
-rw-r--r--lib/ssh/test/ssh_basic_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index dceec52464..93029c5038 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -272,7 +272,7 @@ rekey(Config) ->
{user_interaction, false},
{rekey_limit, 0}]),
receive
- after 15000 ->
+ after 200000 ->
%%By this time rekeying would have been done
ssh:close(ConnectionRef),
ssh:stop_daemon(Pid)