From 9971f38968b19ba90e0267b8c7a549fc568d5611 Mon Sep 17 00:00:00 2001 From: Fredrik Gustafsson Date: Tue, 27 Nov 2012 15:33:47 +0100 Subject: Basic functionality for sftp ver6 and testcase --- lib/ssh/test/ssh_sftpd_SUITE.erl | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'lib/ssh/test/ssh_sftpd_SUITE.erl') diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl index b995eb9f0e..ad4652521f 100644 --- a/lib/ssh/test/ssh_sftpd_SUITE.erl +++ b/lib/ssh/test/ssh_sftpd_SUITE.erl @@ -58,7 +58,8 @@ all() -> links, ver3_rename, relpath, - sshd_read_file]. + sshd_read_file, + ver6_basic]. groups() -> []. @@ -128,6 +129,8 @@ init_per_testcase(TestCase, Config) -> ProtocolVer = case atom_to_list(TestCase) of "ver3_" ++ _ -> 3; + "ver6_" ++ _ -> + 6; _ -> ?SSH_SFTP_PROTOCOL_VERSION end, @@ -591,7 +594,18 @@ sshd_read_file(Config) when is_list(Config) -> read_file(Handle, 100, 0, Cm, Channel, NewReqId), {ok, Data} = file:read_file(FileName). - +ver6_basic(doc) -> + ["Test SFTP Version 6"]; +ver6_basic(Config) when is_list(Config) -> + PrivDir = ?config(priv_dir, Config), + %FileName = filename:join(PrivDir, "test.txt"), + {Cm, Channel} = ?config(sftp, Config), + ReqId = 0, + {ok, <>, _} = + open_file(PrivDir, Cm, Channel, ReqId, + ?ACE4_READ_DATA bor ?ACE4_READ_ATTRIBUTES, + ?SSH_FXF_OPEN_EXISTING). %%-------------------------------------------------------------------- %% Internal functions ------------------------------------------------ %%-------------------------------------------------------------------- -- cgit v1.2.3 From 6801fa8751fe1d495099230f5d49867fd8a91cfc Mon Sep 17 00:00:00 2001 From: Fredrik Gustafsson Date: Wed, 28 Nov 2012 10:04:25 +0100 Subject: Changes to sftpd test suite --- lib/ssh/test/ssh_sftpd_SUITE.erl | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'lib/ssh/test/ssh_sftpd_SUITE.erl') 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, -- cgit v1.2.3 From 3b697a2e0de3dc02461d811b8714ad91470b9e2c Mon Sep 17 00:00:00 2001 From: Fredrik Gustafsson Date: Wed, 28 Nov 2012 11:48:11 +0100 Subject: changed option to sftpd_vsn --- lib/ssh/test/ssh_sftpd_SUITE.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/ssh/test/ssh_sftpd_SUITE.erl') diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl index ab6ff4cac2..9877d39ec4 100644 --- a/lib/ssh/test/ssh_sftpd_SUITE.erl +++ b/lib/ssh/test/ssh_sftpd_SUITE.erl @@ -114,7 +114,7 @@ init_per_testcase(TestCase, Config) -> {user_dir, PrivDir}, {user_passwords,[{?USER, ?PASSWD}]}, {pwdfun, fun(_,_) -> true end}, - {sftp_vsn, 6}]); + {sftpd_vsn, 6}]); _ -> ssh_sftpd:listen(Port, [{system_dir, SystemDir}, {user_dir, PrivDir}, -- cgit v1.2.3 From 0935ad3069a1372e40cf20631ede94181ef01353 Mon Sep 17 00:00:00 2001 From: Fredrik Gustafsson Date: Wed, 28 Nov 2012 15:23:18 +0100 Subject: Changed testcases to proper sftpd listening --- lib/ssh/test/ssh_sftpd_SUITE.erl | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'lib/ssh/test/ssh_sftpd_SUITE.erl') diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl index 9877d39ec4..2f81e89433 100644 --- a/lib/ssh/test/ssh_sftpd_SUITE.erl +++ b/lib/ssh/test/ssh_sftpd_SUITE.erl @@ -107,19 +107,17 @@ init_per_testcase(TestCase, Config) -> SystemDir = filename:join(?config(priv_dir, Config), system), Port = ssh_test_lib:inet_port(node()), - + Options = [{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}, - {sftpd_vsn, 6}]); + SubSystems = [ssh_sftpd:subsystem_spec([{sftpd_vsn, 6}])], + ssh:daemon(Port, [{subsystems, SubSystems}|Options]); _ -> - ssh_sftpd:listen(Port, [{system_dir, SystemDir}, - {user_dir, PrivDir}, - {user_passwords,[{?USER, ?PASSWD}]}, - {pwdfun, fun(_,_) -> true end}]) + SubSystems = [ssh_sftpd:subsystem_spec([])], + ssh:daemon(Port, [{subsystems, SubSystems}|Options]) end, Cm = ssh_test_lib:connect(Port, -- cgit v1.2.3 From 19c560d98202b87e5b158f673fd48ba347e623ee Mon Sep 17 00:00:00 2001 From: Fredrik Gustafsson Date: Thu, 29 Nov 2012 14:59:13 +0100 Subject: Removed unused code ssh.erl and changed tests --- lib/ssh/test/ssh_sftpd_SUITE.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/ssh/test/ssh_sftpd_SUITE.erl') diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl index 2f81e89433..5aa46872ee 100644 --- a/lib/ssh/test/ssh_sftpd_SUITE.erl +++ b/lib/ssh/test/ssh_sftpd_SUITE.erl @@ -348,7 +348,7 @@ mk_rm_dir(Config) when is_list(Config) -> _/binary>>, _} = mkdir(DirName, Cm, Channel, ReqId), NewReqId = 1, - {ok, <>, _} = mkdir(DirName, Cm, Channel, NewReqId), NewReqId1 = 2, -- cgit v1.2.3