diff options
| author | Hans Nilsson <[email protected]> | 2015-10-29 15:08:31 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-10-29 15:08:31 +0100 |
| commit | 0563f1132a4b2fbb04dcbcea51e68a7f110502f2 (patch) | |
| tree | cbc24bb19815f17a137e6bc5ff6ce27d1309e664 /lib/ssh/test/ssh_renegotiate_SUITE.erl | |
| parent | b55819b53ecdc15c754022ba5562084adb2f438c (diff) | |
| parent | 3c7c228a2889e0c83291d99ad45acea7756ded0f (diff) | |
| download | otp-0563f1132a4b2fbb04dcbcea51e68a7f110502f2.tar.gz otp-0563f1132a4b2fbb04dcbcea51e68a7f110502f2.tar.bz2 otp-0563f1132a4b2fbb04dcbcea51e68a7f110502f2.zip | |
Merge branch 'hans/ssh/cuddle_tests' into maint
* hans/ssh/cuddle_tests:
ssh: Adjust the test ssh_renegotiate_SUITE:rekey_limit
ssh: fix spelling error pulic -> public
Diffstat (limited to 'lib/ssh/test/ssh_renegotiate_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_renegotiate_SUITE.erl | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/ssh/test/ssh_renegotiate_SUITE.erl b/lib/ssh/test/ssh_renegotiate_SUITE.erl index 9daa6efc02..ef631d54bd 100644 --- a/lib/ssh/test/ssh_renegotiate_SUITE.erl +++ b/lib/ssh/test/ssh_renegotiate_SUITE.erl @@ -89,9 +89,10 @@ rekey_limit(Config) -> UserDir = ?config(priv_dir, Config), DataFile = filename:join(UserDir, "rekey.data"), - {Pid, Host, Port} = ssh_test_lib:std_daemon(Config,[]), + {Pid, Host, Port} = ssh_test_lib:std_daemon(Config,[{max_random_length_padding,0}]), - ConnectionRef = ssh_test_lib:std_connect(Config, Host, Port, [{rekey_limit, 4500}]), + ConnectionRef = ssh_test_lib:std_connect(Config, Host, Port, [{rekey_limit, 6000}, + {max_random_length_padding,0}]), {ok, SftpPid} = ssh_sftp:start_channel(ConnectionRef), Kex1 = get_kex_init(ConnectionRef), @@ -132,13 +133,13 @@ renegotiate1(Config) -> UserDir = ?config(priv_dir, Config), DataFile = filename:join(UserDir, "renegotiate1.data"), - {Pid, Host, DPort} = ssh_test_lib:std_daemon(Config,[]), + {Pid, Host, DPort} = ssh_test_lib:std_daemon(Config,[{max_random_length_padding,0}]), RPort = ssh_test_lib:inet_port(), {ok,RelayPid} = ssh_relay:start_link({0,0,0,0}, RPort, Host, DPort), - ConnectionRef = ssh_test_lib:std_connect(Config, Host, RPort, []), + ConnectionRef = ssh_test_lib:std_connect(Config, Host, RPort, [{max_random_length_padding,0}]), {ok, SftpPid} = ssh_sftp:start_channel(ConnectionRef), Kex1 = get_kex_init(ConnectionRef), @@ -170,12 +171,12 @@ renegotiate2(Config) -> UserDir = ?config(priv_dir, Config), DataFile = filename:join(UserDir, "renegotiate2.data"), - {Pid, Host, DPort} = ssh_test_lib:std_daemon(Config,[]), + {Pid, Host, DPort} = ssh_test_lib:std_daemon(Config,[{max_random_length_padding,0}]), RPort = ssh_test_lib:inet_port(), {ok,RelayPid} = ssh_relay:start_link({0,0,0,0}, RPort, Host, DPort), - ConnectionRef = ssh_test_lib:std_connect(Config, Host, RPort, []), + ConnectionRef = ssh_test_lib:std_connect(Config, Host, RPort, [{max_random_length_padding,0}]), {ok, SftpPid} = ssh_sftp:start_channel(ConnectionRef), Kex1 = get_kex_init(ConnectionRef), |