diff options
author | Erlang/OTP <[email protected]> | 2013-03-08 09:35:31 +0100 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2013-03-08 09:35:31 +0100 |
commit | ec3109358445e7150e487a5f458c80a51187df00 (patch) | |
tree | 6d050fa10279929da263cefe0e71654779434e8f /lib/ssh/test/ssh_basic_SUITE.erl | |
parent | 897f7a65e0475a7a215adb27423adc04db7d47c6 (diff) | |
parent | 066a44edb1d07d6d4f5694e5301910178c5c3b37 (diff) | |
download | otp-ec3109358445e7150e487a5f458c80a51187df00.tar.gz otp-ec3109358445e7150e487a5f458c80a51187df00.tar.bz2 otp-ec3109358445e7150e487a5f458c80a51187df00.zip |
Merge branch 'fredrik/ssh/fix-rekeying/OTP-10911' into maint-r16
* fredrik/ssh/fix-rekeying/OTP-10911:
Fixed rekeying initiation and secured testcase
Diffstat (limited to 'lib/ssh/test/ssh_basic_SUITE.erl')
-rw-r--r-- | lib/ssh/test/ssh_basic_SUITE.erl | 2 |
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 efcb11f88f..80273420d9 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) |