diff options
| author | Fredrik Gustafsson <[email protected]> | 2012-11-28 10:04:25 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2012-11-28 10:04:25 +0100 |
| commit | 6801fa8751fe1d495099230f5d49867fd8a91cfc (patch) | |
| tree | 37c0ff81802649836be92a09af6c825cab284a49 /lib/ssh/test/ssh_sftpd_SUITE.erl | |
| parent | 6c82d9eb6476216458a5762edb41cecd3d4d595e (diff) | |
| download | otp-6801fa8751fe1d495099230f5d49867fd8a91cfc.tar.gz otp-6801fa8751fe1d495099230f5d49867fd8a91cfc.tar.bz2 otp-6801fa8751fe1d495099230f5d49867fd8a91cfc.zip | |
Changes to sftpd test suite
Diffstat (limited to 'lib/ssh/test/ssh_sftpd_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_sftpd_SUITE.erl | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl index ad4652521f..ab6ff4cac2 100644 --- a/lib/ssh/test/ssh_sftpd_SUITE.erl +++ b/lib/ssh/test/ssh_sftpd_SUITE.erl @@ -108,11 +108,19 @@ init_per_testcase(TestCase, Config) -> Port = ssh_test_lib:inet_port(node()), - {ok, Sftpd} = - ssh_sftpd:listen(Port, [{system_dir, SystemDir}, - {user_dir, PrivDir}, - {user_passwords,[{?USER, ?PASSWD}]}, - {pwdfun, fun(_,_) -> true end}]), + {ok, Sftpd} = case TestCase of + ver6_basic -> + ssh_sftpd:listen(Port, [{system_dir, SystemDir}, + {user_dir, PrivDir}, + {user_passwords,[{?USER, ?PASSWD}]}, + {pwdfun, fun(_,_) -> true end}, + {sftp_vsn, 6}]); + _ -> + ssh_sftpd:listen(Port, [{system_dir, SystemDir}, + {user_dir, PrivDir}, + {user_passwords,[{?USER, ?PASSWD}]}, + {pwdfun, fun(_,_) -> true end}]) + end, Cm = ssh_test_lib:connect(Port, [{user_dir, ClientUserDir}, @@ -129,8 +137,6 @@ init_per_testcase(TestCase, Config) -> ProtocolVer = case atom_to_list(TestCase) of "ver3_" ++ _ -> 3; - "ver6_" ++ _ -> - 6; _ -> ?SSH_SFTP_PROTOCOL_VERSION end, |