diff options
| author | Lukas Larsson <[email protected]> | 2012-08-27 11:39:27 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-08-27 11:39:27 +0200 |
| commit | c44761ce22e76d9d07241ea5942e4b7e2c7aeb28 (patch) | |
| tree | d164b84559e573aa61156a1b96869ee1fd45410c /lib/common_test/src/ct_ftp.erl | |
| parent | 4877acc0598fe257315e8398dc9e11428d757000 (diff) | |
| parent | a95a238719369feb1002daeacf4e1485439a38d2 (diff) | |
| download | otp-c44761ce22e76d9d07241ea5942e4b7e2c7aeb28.tar.gz otp-c44761ce22e76d9d07241ea5942e4b7e2c7aeb28.tar.bz2 otp-c44761ce22e76d9d07241ea5942e4b7e2c7aeb28.zip | |
Merge branch 'lukas/common_test/deep_get_config/OTP-9626' into maint
* lukas/common_test/deep_get_config/OTP-9626:
Add more cross reference links to ct docs
Remove config option from common_test args
Update user config to use nested tuple keys
Diffstat (limited to 'lib/common_test/src/ct_ftp.erl')
| -rw-r--r-- | lib/common_test/src/ct_ftp.erl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/common_test/src/ct_ftp.erl b/lib/common_test/src/ct_ftp.erl index 5db73066a3..723715c986 100644 --- a/lib/common_test/src/ct_ftp.erl +++ b/lib/common_test/src/ct_ftp.erl @@ -66,6 +66,7 @@ %%% {unix,[{ftp,IpAddr}, %%% {username,Username}, %%% {password,Password}]}.</pre> +%%% @see ct:require/2 put(KeyOrName,LocalFile,RemoteFile) -> Fun = fun(Ftp) -> send(Ftp,LocalFile,RemoteFile) end, open_and_do(KeyOrName,Fun). @@ -85,6 +86,7 @@ put(KeyOrName,LocalFile,RemoteFile) -> %%% %%% <p>The config file must be as for put/3.</p> %%% @see put/3 +%%% @see ct:require/2 get(KeyOrName,RemoteFile,LocalFile) -> Fun = fun(Ftp) -> recv(Ftp,RemoteFile,LocalFile) end, open_and_do(KeyOrName,Fun). @@ -105,6 +107,10 @@ get(KeyOrName,RemoteFile,LocalFile) -> %%% simply use <code>Key</code>, the configuration variable name, to %%% specify the target. Note that a connection that has no associated target %%% name can only be closed with the handle value.</p> +%%% +%%% <p>See <c>ct:require/2</c> for how to create a new <c>Name</c></p> +%%% +%%% @see ct:require/2 open(KeyOrName) -> case ct_util:get_key_from_name(KeyOrName) of {ok,node} -> |