aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-05-04 14:57:30 +0200
committerHans Nilsson <[email protected]>2016-05-04 14:57:30 +0200
commitd9f30be07f6ebb014f6021ac2bd3a99894da4c53 (patch)
treeeaf8f5cd4a17210ab2aa09b5cd3e903b8e139a05 /lib
parenteda89507c1f53e29b3c0be01b47c6cf278960cd6 (diff)
parent5762a0299f9b55ab313b78bb6cecdad083e7ec7a (diff)
downloadotp-d9f30be07f6ebb014f6021ac2bd3a99894da4c53.tar.gz
otp-d9f30be07f6ebb014f6021ac2bd3a99894da4c53.tar.bz2
otp-d9f30be07f6ebb014f6021ac2bd3a99894da4c53.zip
Merge branch 'hans/ssh/cuddle_tests'
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh/test/ssh_benchmark_SUITE.erl12
-rw-r--r--lib/ssh/test/ssh_upgrade_SUITE.erl3
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/ssh/test/ssh_benchmark_SUITE.erl b/lib/ssh/test/ssh_benchmark_SUITE.erl
index 1f11fee350..d9be1a32b7 100644
--- a/lib/ssh/test/ssh_benchmark_SUITE.erl
+++ b/lib/ssh/test/ssh_benchmark_SUITE.erl
@@ -334,16 +334,16 @@ find_time(accept_to_hello, L) ->
C#call.t_call
end,
?LINE,
- fun(C=#call{mfa = {ssh_connection_handler,handle_event,5},
- args = [_, {version_exchange,_}, _, {hello,_}, _]}) ->
+ fun(C=#call{mfa = {ssh_connection_handler,handle_event,4},
+ args = [_, {version_exchange,_}, {hello,_}, _]}) ->
C#call.t_call
end,
?LINE
], L, []),
{accept_to_hello, now2micro_sec(now_diff(T1,T0)), microsec};
find_time(kex, L) ->
- [T0,T1] = find([fun(C=#call{mfa = {ssh_connection_handler,handle_event,5},
- args = [_, {version_exchange,_}, _, {hello,_}, _]}) ->
+ [T0,T1] = find([fun(C=#call{mfa = {ssh_connection_handler,handle_event,4},
+ args = [_, {version_exchange,_}, {hello,_}, _]}) ->
C#call.t_call
end,
?LINE,
@@ -466,8 +466,8 @@ erlang_trace() ->
{ssh_message,decode,1},
{public_key,dh_gex_group,4} % To find dh_gex group size
]],
- init_trace({ssh_connection_handler,handle_event,5},
- [{['_', {version_exchange,'_'}, '_', {hello,'_'}, '_'],
+ init_trace({ssh_connection_handler,handle_event,4},
+ [{['_', {version_exchange,'_'}, {hello,'_'}, '_'],
[],
[return_trace]}]),
{ok, TracerPid}.
diff --git a/lib/ssh/test/ssh_upgrade_SUITE.erl b/lib/ssh/test/ssh_upgrade_SUITE.erl
index 5c7ec17dac..06bef2455e 100644
--- a/lib/ssh/test/ssh_upgrade_SUITE.erl
+++ b/lib/ssh/test/ssh_upgrade_SUITE.erl
@@ -146,7 +146,8 @@ setup_server_client(#state{config=Config} = State) ->
SFTP = ssh_sftpd:subsystem_spec([{root,FtpRootDir},{cwd,FtpRootDir}]),
- {Server,Host,Port} = ssh_test_lib:daemon([{system_dir,DataDir},
+ {Server,Host,Port} = ssh_test_lib:daemon(ssh_test_lib:inet_port(), % when lower rel is 18.x
+ [{system_dir,DataDir},
{user_passwords,[{"hej","hopp"}]},
{subsystems,[SFTP]}]),