diff options
| author | Erlang/OTP <[email protected]> | 2013-03-08 14:49:03 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2013-03-08 14:49:03 +0100 |
| commit | 79719be40f24b300d85735629c26db73c2d603a1 (patch) | |
| tree | d43b182a4ecd3942638bc0acf4caf5a077ea368f /lib/ssh/test/ssh_basic_SUITE.erl | |
| parent | cad57e4df850d64587759d951af501fb210e499f (diff) | |
| parent | 2a2fa47f14a69ea49709552196db61df971e0a2d (diff) | |
| download | otp-79719be40f24b300d85735629c26db73c2d603a1.tar.gz otp-79719be40f24b300d85735629c26db73c2d603a1.tar.bz2 otp-79719be40f24b300d85735629c26db73c2d603a1.zip | |
Merge branch 'ia/ssh/errorhandling-nonexisting-subsystem/OTP-10714' into maint-r16
* ia/ssh/errorhandling-nonexisting-subsystem/OTP-10714:
ssh: Prepare for upcoming release
ssh: Test and enhance handling of nonexistent subsystem
Prepare release
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) |