diff options
author | Hans Nilsson <[email protected]> | 2013-11-20 12:04:16 +0100 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2013-11-20 12:04:16 +0100 |
commit | 265f95e7fc9f813c7d0c7d1fb64e5084515089c9 (patch) | |
tree | 9525eed9a4989228c588451661fa9de3f5db187e /lib/inets/test/ftp_ticket_test.erl | |
parent | 4bb55a35e516cb407bdda1b319ab2cd0bb85a3b8 (diff) | |
parent | 0d57daec5738447eb033681834146bf31dfd266c (diff) | |
download | otp-265f95e7fc9f813c7d0c7d1fb64e5084515089c9.tar.gz otp-265f95e7fc9f813c7d0c7d1fb64e5084515089c9.tar.bz2 otp-265f95e7fc9f813c7d0c7d1fb64e5084515089c9.zip |
Merge branch 'hans/inets/ftps/OTP-11037' into maint
* hans/inets/ftps/OTP-11037:
ftp,ssl: Fixes broken type link (ssloption).
ftp: Adds dynamic cert generation to tests.
ftp: Clean Makefile and conf file
ftp: Linking rfc-refs.
ftp: Add documentation.
ftp: delete old test files
ftp: small fixes
ftp: Add ftps documentation
ftp: Add timeouts to ssl:connect
ftps: working
.
added some printouts
ftp: towards a working ftps, chapter 1
ftp: old ftp_SUITE re-written and works
ftp: Implement ftps (upgrade to TLS)
ftp: Implement ftps (upgrade to TLS)
Diffstat (limited to 'lib/inets/test/ftp_ticket_test.erl')
-rw-r--r-- | lib/inets/test/ftp_ticket_test.erl | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/lib/inets/test/ftp_ticket_test.erl b/lib/inets/test/ftp_ticket_test.erl deleted file mode 100644 index fe4ab35728..0000000000 --- a/lib/inets/test/ftp_ticket_test.erl +++ /dev/null @@ -1,61 +0,0 @@ -%% -%% %CopyrightBegin% -%% -%% Copyright Ericsson AB 2006-2010. 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 -%% compliance with the License. You should have received a copy of the -%% Erlang Public License along with this software. If not, it can be -%% retrieved online at http://www.erlang.org/. -%% -%% Software distributed under the License is distributed on an "AS IS" -%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See -%% the License for the specific language governing rights and limitations -%% under the License. -%% -%% %CopyrightEnd% -%% -%% - --module(ftp_ticket_test). - --compile(export_all). - --define(LIB_MOD,ftp_suite_lib). --define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)). --define(PLATFORM,"Solaris 8 sparc "). - - -%% Test server callbacks -init_per_testcase(Case, Config) -> - ftp_suite_lib:init_per_testcase(Case, Config). - -end_per_testcase(Case, Config) -> - ftp_suite_lib:end_per_testcase(Case, Config). - - -all() -> - tickets(). - -groups() -> - []. - -init_per_group(_GroupName, Config) -> - Config. - -end_per_group(_GroupName, Config) -> - Config. - - -init_per_suite(Config) -> - ?LIB_MOD:ftpd_init(ticket_test, Config). - -tickets() -> - [ticket_6035]. - - -end_per_suite(Config) -> - ?LIB_MOD:ftpd_fin(Config). - -ticket_6035(X) -> ?LIB_MOD:ticket_6035(X). |