diff options
author | Micael Karlberg <[email protected]> | 2011-09-19 14:28:06 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-09-19 14:28:06 +0200 |
commit | 724ae2b149b60063ff140f58d9d9a86f2fd93048 (patch) | |
tree | 58188efd5694f0f4aeec258eea69612581e09f9e /lib/inets/test/ftp_windows_2003_server_test.erl | |
parent | 4b8958c0397765bd208dbf0dd297c654ed0c33d1 (diff) | |
download | otp-724ae2b149b60063ff140f58d9d9a86f2fd93048.tar.gz otp-724ae2b149b60063ff140f58d9d9a86f2fd93048.tar.bz2 otp-724ae2b149b60063ff140f58d9d9a86f2fd93048.zip |
[ftpc] Add a config option to specify a data connect timeout.
That is how long the ftp client will wait for the server to connect
to the data socket. If this timeout occurs, an error will be returned
to the caller and the ftp client process will be terminated.
OTP-9545
Diffstat (limited to 'lib/inets/test/ftp_windows_2003_server_test.erl')
-rw-r--r-- | lib/inets/test/ftp_windows_2003_server_test.erl | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/lib/inets/test/ftp_windows_2003_server_test.erl b/lib/inets/test/ftp_windows_2003_server_test.erl index 57f1ae8358..32f25713f8 100644 --- a/lib/inets/test/ftp_windows_2003_server_test.erl +++ b/lib/inets/test/ftp_windows_2003_server_test.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2010. All Rights Reserved. +%% Copyright Ericsson AB 2005-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -87,14 +87,22 @@ end_per_testcase(Case, Config) -> %% Description: Returns a list of all test cases in this test suite %%-------------------------------------------------------------------- all() -> - [open, open_port, {group, passive}, {group, active}, - api_missuse, not_owner, {group, progress_report}]. + [ + open, + open_port, + {group, passive}, + {group, active}, + api_missuse, + not_owner, + {group, progress_report} + ]. groups() -> - [{passive, [], ftp_suite_lib:passive(suite)}, - {active, [], ftp_suite_lib:active(suite)}, - {progress_report, [], - ftp_suite_lib:progress_report(suite)}]. + [ + {passive, [], ftp_suite_lib:passive(suite)}, + {active, [], ftp_suite_lib:active(suite)}, + {progress_report, [], ftp_suite_lib:progress_report(suite)} + ]. init_per_group(_GroupName, Config) -> Config. |