diff options
| author | Hans Nilsson <[email protected]> | 2015-10-08 16:04:30 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-10-08 16:04:30 +0200 |
| commit | 309c4b503df1a586e57f6558b6de08245fa80d47 (patch) | |
| tree | 1b0c32b3b98c8278c375a30dd9e3a226f2942cbb /lib/ssh/test/ssh_test_lib.erl | |
| parent | 0bc373ca42a1e880a97e34f664ab968144c2a4f4 (diff) | |
| parent | ca0aef835dba5ef2c4185289092ed0fc2f1bb2ba (diff) | |
| download | otp-309c4b503df1a586e57f6558b6de08245fa80d47.tar.gz otp-309c4b503df1a586e57f6558b6de08245fa80d47.tar.bz2 otp-309c4b503df1a586e57f6558b6de08245fa80d47.zip | |
Merge branch 'hans/ssh/option_dh_gex_limits_ignored/OTP-13029' into maint
Diffstat (limited to 'lib/ssh/test/ssh_test_lib.erl')
| -rw-r--r-- | lib/ssh/test/ssh_test_lib.erl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl index 6fa579d78d..cc3ebf8151 100644 --- a/lib/ssh/test/ssh_test_lib.erl +++ b/lib/ssh/test/ssh_test_lib.erl @@ -93,9 +93,12 @@ std_connect(Config, Host, Port, ExtraOpts) -> | ExtraOpts]). std_simple_sftp(Host, Port, Config) -> + std_simple_sftp(Host, Port, Config, []). + +std_simple_sftp(Host, Port, Config, Opts) -> UserDir = ?config(priv_dir, Config), DataFile = filename:join(UserDir, "test.data"), - ConnectionRef = ssh_test_lib:std_connect(Config, Host, Port, []), + ConnectionRef = ssh_test_lib:std_connect(Config, Host, Port, Opts), {ok, ChannelRef} = ssh_sftp:start_channel(ConnectionRef), Data = crypto:rand_bytes(proplists:get_value(std_simple_sftp_size,Config,10)), ok = ssh_sftp:write_file(ChannelRef, DataFile, Data), @@ -104,7 +107,10 @@ std_simple_sftp(Host, Port, Config) -> Data == ReadData. std_simple_exec(Host, Port, Config) -> - ConnectionRef = ssh_test_lib:std_connect(Config, Host, Port, []), + std_simple_exec(Host, Port, Config, []). + +std_simple_exec(Host, Port, Config, Opts) -> + ConnectionRef = ssh_test_lib:std_connect(Config, Host, Port, Opts), {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity), success = ssh_connection:exec(ConnectionRef, ChannelId, "23+21-2.", infinity), Data = {ssh_cm, ConnectionRef, {data, ChannelId, 0, <<"42\n">>}}, |