diff options
| author | Hans Nilsson <[email protected]> | 2017-06-12 12:21:17 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-06-12 12:21:17 +0200 |
| commit | 4665af0b305cb45e2bf5da10ca540a0a032ece47 (patch) | |
| tree | 37c4bb2e63dca3649079446742a562d516a7d866 /lib/ssh | |
| parent | 56450ba832fbd6a3f32f4a1814b188ab28981bd2 (diff) | |
| parent | e46e9d5bec5089d16d0cae7b435c4c82f57f0316 (diff) | |
| download | otp-4665af0b305cb45e2bf5da10ca540a0a032ece47.tar.gz otp-4665af0b305cb45e2bf5da10ca540a0a032ece47.tar.bz2 otp-4665af0b305cb45e2bf5da10ca540a0a032ece47.zip | |
Merge branch 'hans/ssh/cuddle_tests'
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/test/ssh_options_SUITE.erl | 4 | ||||
| -rw-r--r-- | lib/ssh/test/ssh_protocol_SUITE.erl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssh/test/ssh_options_SUITE.erl b/lib/ssh/test/ssh_options_SUITE.erl index b710ca8fb7..8b454ffe5d 100644 --- a/lib/ssh/test/ssh_options_SUITE.erl +++ b/lib/ssh/test/ssh_options_SUITE.erl @@ -555,14 +555,14 @@ connectfun_disconnectfun_server(Config) -> {disconnect,Ref,R} -> ct:log("Disconnect result: ~p",[R]), ssh:stop_daemon(Pid) - after 5000 -> + after 10000 -> receive X -> ct:log("received ~p",[X]) after 0 -> ok end, {fail, "No disconnectfun action"} end - after 5000 -> + after 10000 -> receive X -> ct:log("received ~p",[X]) after 0 -> ok diff --git a/lib/ssh/test/ssh_protocol_SUITE.erl b/lib/ssh/test/ssh_protocol_SUITE.erl index 0385e30ad1..0837fe7eaf 100644 --- a/lib/ssh/test/ssh_protocol_SUITE.erl +++ b/lib/ssh/test/ssh_protocol_SUITE.erl @@ -466,7 +466,7 @@ bad_long_service_name(Config) -> bad_very_long_service_name(Config) -> bad_service_name(Config, - lists:duplicate(4*?SSH_MAX_PACKET_SIZE, $a)). + lists:duplicate(?SSH_MAX_PACKET_SIZE+5, $a)). empty_service_name(Config) -> bad_service_name(Config, ""). |