diff options
| author | Peter Andersson <[email protected]> | 2012-08-27 12:00:24 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-08-27 12:00:24 +0200 |
| commit | 0ff106bd0fa654c09144102ca5baf73bb1d3a459 (patch) | |
| tree | b8d4dfb7b689823a28353b5ad41f0302360ed281 /lib/common_test/src/ct_ftp.erl | |
| parent | ae2c50f36806b26530de88d2609cd6ced018cb54 (diff) | |
| parent | fd7423d3fc1a32e497084d5c70e2d05792032925 (diff) | |
| download | otp-0ff106bd0fa654c09144102ca5baf73bb1d3a459.tar.gz otp-0ff106bd0fa654c09144102ca5baf73bb1d3a459.tar.bz2 otp-0ff106bd0fa654c09144102ca5baf73bb1d3a459.zip | |
Merge remote branch 'upstream/maint' into maint
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} -> |