Fix formatting for inets

24 files changed, 304 insertions, 327 deletions

diff --git a/lib/inets/test/ftp_SUITE.erl b/lib/inets/test/ftp_SUITE.erl
index 173731b1ca..32501af362 100644
--- a/lib/inets/test/ftp_SUITE.erl
+++ b/lib/inets/test/ftp_SUITE.erl
@@ -28,21 +28,6 @@
 % -export([init_per_testcase/2, end_per_testcase/2]).
 -export([init_per_suite/1, end_per_suite/1]).
 
-%% Test cases must be exported.
--export([
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-]).
-
 -define(FTP_USER, "anonymous").
 -define(FTP_PASS, passwd()).
 -define(FTP_PORT, 21).
@@ -75,32 +60,32 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[{group, solaris8_test}, {group, solaris9_test},
- {group, solaris10_test}, {group, linux_x86_test},
- {group, linux_ppc_test}, {group, macosx_x86_test},
- {group, macosx_ppc_test}, {group, openbsd_test},
- {group, freebsd_test}, {group, netbsd_test},
- {group, windows_xp_test},
- {group, windows_2003_server_test},
- {group, ticket_tests}].
+    [{group, solaris8_test}, {group, solaris9_test},
+     {group, solaris10_test}, {group, linux_x86_test},
+     {group, linux_ppc_test}, {group, macosx_x86_test},
+     {group, macosx_ppc_test}, {group, openbsd_test},
+     {group, freebsd_test}, {group, netbsd_test},
+     {group, windows_xp_test},
+     {group, windows_2003_server_test},
+     {group, ticket_tests}].
 
 groups() -> 
     [{solaris8_test, [], [{ftp_solaris8_sparc_test, all}]},
- {solaris9_test, [], [{ftp_solaris9_sparc_test, all}]},
- {solaris10_test, [],
-  [{ftp_solaris10_sparc_test, all},
-   {ftp_solaris10_x86_test, all}]},
- {linux_x86_test, [], [{ftp_linux_x86_test, all}]},
- {linux_ppc_test, [], [{ftp_linux_ppc_test, all}]},
- {macosx_x86_test, [], [{ftp_macosx_x86_test, all}]},
- {macosx_ppc_test, [], [{ftp_macosx_ppc_test, all}]},
- {openbsd_test, [], [{ftp_openbsd_x86_test, all}]},
- {freebsd_test, [], [{ftp_freebsd_x86_test, all}]},
- {netbsd_test, [], [{ftp_netbsd_x86_test, all}]},
- {windows_xp_test, [], [{ftp_windows_xp_test, all}]},
- {windows_2003_server_test, [],
-  [{ftp_windows_2003_server_test, all}]},
- {ticket_tests, [], [{ftp_ticket_test, all}]}].
+     {solaris9_test, [], [{ftp_solaris9_sparc_test, all}]},
+     {solaris10_test, [],
+      [{ftp_solaris10_sparc_test, all},
+       {ftp_solaris10_x86_test, all}]},
+     {linux_x86_test, [], [{ftp_linux_x86_test, all}]},
+     {linux_ppc_test, [], [{ftp_linux_ppc_test, all}]},
+     {macosx_x86_test, [], [{ftp_macosx_x86_test, all}]},
+     {macosx_ppc_test, [], [{ftp_macosx_ppc_test, all}]},
+     {openbsd_test, [], [{ftp_openbsd_x86_test, all}]},
+     {freebsd_test, [], [{ftp_freebsd_x86_test, all}]},
+     {netbsd_test, [], [{ftp_netbsd_x86_test, all}]},
+     {windows_xp_test, [], [{ftp_windows_xp_test, all}]},
+     {windows_2003_server_test, [],
+      [{ftp_windows_2003_server_test, all}]},
+     {ticket_tests, [], [{ftp_ticket_test, all}]}].
 
 init_per_group(_GroupName, Config) ->
 	Config.
diff --git a/lib/inets/test/ftp_format_SUITE.erl b/lib/inets/test/ftp_format_SUITE.erl
index 7efc2816af..488560b266 100644
--- a/lib/inets/test/ftp_format_SUITE.erl
+++ b/lib/inets/test/ftp_format_SUITE.erl
@@ -25,24 +25,26 @@
 -include("ftp_internal.hrl").
 
 %% Test server specific exports
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 init_per_testcase/2, end_per_testcase/2]).
 
 %% Test cases must be exported.
 -export([ ftp_150/1, 
-	 ftp_200/1,  ftp_220/1, ftp_226/1, ftp_257/1, ftp_331/1, ftp_425/1, 
-	 ftp_other_status_codes/1, ftp_multiple_lines/1, 
-	 ftp_multipel_ctrl_messages/1, format_error/1]).
+	  ftp_200/1,  ftp_220/1, ftp_226/1, ftp_257/1, ftp_331/1, ftp_425/1, 
+	  ftp_other_status_codes/1, ftp_multiple_lines/1, 
+	  ftp_multipel_ctrl_messages/1, format_error/1]).
 
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[{group, ftp_response}, format_error].
+    [{group, ftp_response}, format_error].
 
 groups() -> 
     [{ftp_response, [],
-  [ftp_150, ftp_200, ftp_220, ftp_226, ftp_257, ftp_331,
-   ftp_425, ftp_other_status_codes, ftp_multiple_lines,
-   ftp_multipel_ctrl_messages]}].
+      [ftp_150, ftp_200, ftp_220, ftp_226, ftp_257, ftp_331,
+       ftp_425, ftp_other_status_codes, ftp_multiple_lines,
+       ftp_multipel_ctrl_messages]}].
 
 init_per_suite(Config) ->
     Config.
@@ -51,10 +53,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(_, Config) ->
diff --git a/lib/inets/test/ftp_freebsd_x86_test.erl b/lib/inets/test/ftp_freebsd_x86_test.erl
index d7b9a65470..1d66779882 100644
--- a/lib/inets/test/ftp_freebsd_x86_test.erl
+++ b/lib/inets/test/ftp_freebsd_x86_test.erl
@@ -87,20 +87,20 @@ 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)}].
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 %% Test cases starts here.
diff --git a/lib/inets/test/ftp_linux_ppc_test.erl b/lib/inets/test/ftp_linux_ppc_test.erl
index 061e49d6c9..bba97237f1 100644
--- a/lib/inets/test/ftp_linux_ppc_test.erl
+++ b/lib/inets/test/ftp_linux_ppc_test.erl
@@ -88,20 +88,20 @@ 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)}].
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 %% Test cases starts here.
diff --git a/lib/inets/test/ftp_linux_x86_test.erl b/lib/inets/test/ftp_linux_x86_test.erl
index eb7feb6045..bbefd8231e 100644
--- a/lib/inets/test/ftp_linux_x86_test.erl
+++ b/lib/inets/test/ftp_linux_x86_test.erl
@@ -87,20 +87,20 @@ 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)}].
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 %% Test cases starts here.
diff --git a/lib/inets/test/ftp_netbsd_x86_test.erl b/lib/inets/test/ftp_netbsd_x86_test.erl
index 64f215e550..bb474852c5 100644
--- a/lib/inets/test/ftp_netbsd_x86_test.erl
+++ b/lib/inets/test/ftp_netbsd_x86_test.erl
@@ -87,20 +87,20 @@ 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)}].
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 %% Test cases starts here.
diff --git a/lib/inets/test/ftp_openbsd_x86_test.erl b/lib/inets/test/ftp_openbsd_x86_test.erl
index 5785820bfc..54fce702a0 100644
--- a/lib/inets/test/ftp_openbsd_x86_test.erl
+++ b/lib/inets/test/ftp_openbsd_x86_test.erl
@@ -88,20 +88,20 @@ 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)}].
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 %% Test cases starts here.
diff --git a/lib/inets/test/ftp_solaris10_sparc_test.erl b/lib/inets/test/ftp_solaris10_sparc_test.erl
index 3e8d8d6fd0..0da50dc91b 100644
--- a/lib/inets/test/ftp_solaris10_sparc_test.erl
+++ b/lib/inets/test/ftp_solaris10_sparc_test.erl
@@ -88,20 +88,20 @@ 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)}].
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 %% Test cases starts here.
diff --git a/lib/inets/test/ftp_solaris10_x86_test.erl b/lib/inets/test/ftp_solaris10_x86_test.erl
index 6f703b8e30..3e7045bb4d 100644
--- a/lib/inets/test/ftp_solaris10_x86_test.erl
+++ b/lib/inets/test/ftp_solaris10_x86_test.erl
@@ -89,20 +89,20 @@ 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)}].
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 %% Test cases starts here.
diff --git a/lib/inets/test/ftp_solaris8_sparc_test.erl b/lib/inets/test/ftp_solaris8_sparc_test.erl
index 982ef6ce1c..23dbfc8fe3 100644
--- a/lib/inets/test/ftp_solaris8_sparc_test.erl
+++ b/lib/inets/test/ftp_solaris8_sparc_test.erl
@@ -87,20 +87,20 @@ 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)}].
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 %% Test cases starts here.
diff --git a/lib/inets/test/ftp_solaris9_sparc_test.erl b/lib/inets/test/ftp_solaris9_sparc_test.erl
index 1db0708182..896e2f497f 100644
--- a/lib/inets/test/ftp_solaris9_sparc_test.erl
+++ b/lib/inets/test/ftp_solaris9_sparc_test.erl
@@ -86,20 +86,20 @@ 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)}].
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 %% Test cases starts here.
diff --git a/lib/inets/test/ftp_ticket_test.erl b/lib/inets/test/ftp_ticket_test.erl
index 3b0163a203..fe4ab35728 100644
--- a/lib/inets/test/ftp_ticket_test.erl
+++ b/lib/inets/test/ftp_ticket_test.erl
@@ -36,26 +36,26 @@ end_per_testcase(Case, Config) ->
 
 
 all() -> 
-tickets().
+    tickets().
 
 groups() -> 
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
-init(Config) ->
+init_per_suite(Config) ->
     ?LIB_MOD:ftpd_init(ticket_test, Config).
 
 tickets() -> 
-[ticket_6035].
+    [ticket_6035].
 
 
-fin(Config) ->
+end_per_suite(Config) ->
     ?LIB_MOD:ftpd_fin(Config).
 
 ticket_6035(X) -> ?LIB_MOD:ticket_6035(X).
diff --git a/lib/inets/test/ftp_windows_2003_server_test.erl b/lib/inets/test/ftp_windows_2003_server_test.erl
index 98cbb70a75..57f1ae8358 100644
--- a/lib/inets/test/ftp_windows_2003_server_test.erl
+++ b/lib/inets/test/ftp_windows_2003_server_test.erl
@@ -87,20 +87,20 @@ 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)}].
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 %% Test cases starts here.
diff --git a/lib/inets/test/ftp_windows_xp_test.erl b/lib/inets/test/ftp_windows_xp_test.erl
index a63b5a0844..06d919ba00 100644
--- a/lib/inets/test/ftp_windows_xp_test.erl
+++ b/lib/inets/test/ftp_windows_xp_test.erl
@@ -87,20 +87,20 @@ 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)}].
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
diff --git a/lib/inets/test/http_format_SUITE.erl b/lib/inets/test/http_format_SUITE.erl
index 83e1f08670..61df8c396a 100644
--- a/lib/inets/test/http_format_SUITE.erl
+++ b/lib/inets/test/http_format_SUITE.erl
@@ -30,27 +30,27 @@
 
 %% Test cases must be exported.
 -export([ chunk_decode/1, chunk_encode/1,
-	 chunk_extensions_otp_6005/1, chunk_decode_otp_6264/1,
-	 chunk_decode_empty_chunk_otp_6511/1,
-	 chunk_decode_trailer/1,
-	 http_response/1, http_request/1, validate_request_line/1,
-	 esi_parse_headers/1, cgi_parse_headers/1,
-	 is_absolut_uri/1, convert_netscapecookie_date/1]).
+	  chunk_extensions_otp_6005/1, chunk_decode_otp_6264/1,
+	  chunk_decode_empty_chunk_otp_6511/1,
+	  chunk_decode_trailer/1,
+	  http_response/1, http_request/1, validate_request_line/1,
+	  esi_parse_headers/1, cgi_parse_headers/1,
+	  is_absolut_uri/1, convert_netscapecookie_date/1]).
 
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[{group, chunk}, http_response, http_request,
- validate_request_line, {group, script}, is_absolut_uri,
- convert_netscapecookie_date].
+    [{group, chunk}, http_response, http_request,
+     validate_request_line, {group, script}, is_absolut_uri,
+     convert_netscapecookie_date].
 
 groups() -> 
     [{script, [], [esi_parse_headers, cgi_parse_headers]},
- {chunk, [],
-  [chunk_decode, chunk_encode, chunk_extensions_otp_6005,
-   chunk_decode_otp_6264,
-   chunk_decode_empty_chunk_otp_6511,
-   chunk_decode_trailer]}].
+     {chunk, [],
+      [chunk_decode, chunk_encode, chunk_extensions_otp_6005,
+       chunk_decode_otp_6264,
+       chunk_decode_empty_chunk_otp_6511,
+       chunk_decode_trailer]}].
 
 init_per_suite(Config) ->
     Config.
@@ -59,10 +59,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(_, Config) ->
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index f1dbddee06..e7bde8b541 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -62,44 +62,44 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[proxy_options, proxy_head, proxy_get, proxy_trace,
- proxy_post, proxy_put, proxy_delete, proxy_auth,
- proxy_headers, proxy_emulate_lower_versions,
- http_options, http_head, http_get, http_post,
- http_dummy_pipe, http_inets_pipe, http_trace,
- http_async, http_save_to_file, http_save_to_file_async,
- http_headers, http_headers_dummy, http_bad_response,
- ssl_head, ossl_head, essl_head, ssl_get, ossl_get,
- essl_get, ssl_trace, ossl_trace, essl_trace,
- http_redirect, http_redirect_loop,
- http_internal_server_error, http_userinfo, http_cookie,
- http_server_does_not_exist, http_invalid_http,
- http_emulate_lower_versions, http_relaxed,
- page_does_not_exist, proxy_page_does_not_exist,
- proxy_https_not_supported, http_stream,
- http_stream_once, proxy_stream, parse_url, options,
- ipv6, headers_as_is, {group, tickets}].
+    [proxy_options, proxy_head, proxy_get, proxy_trace,
+     proxy_post, proxy_put, proxy_delete, proxy_auth,
+     proxy_headers, proxy_emulate_lower_versions,
+     http_options, http_head, http_get, http_post,
+     http_dummy_pipe, http_inets_pipe, http_trace,
+     http_async, http_save_to_file, http_save_to_file_async,
+     http_headers, http_headers_dummy, http_bad_response,
+     ssl_head, ossl_head, essl_head, ssl_get, ossl_get,
+     essl_get, ssl_trace, ossl_trace, essl_trace,
+     http_redirect, http_redirect_loop,
+     http_internal_server_error, http_userinfo, http_cookie,
+     http_server_does_not_exist, http_invalid_http,
+     http_emulate_lower_versions, http_relaxed,
+     page_does_not_exist, proxy_page_does_not_exist,
+     proxy_https_not_supported, http_stream,
+     http_stream_once, proxy_stream, parse_url, options,
+     ipv6, headers_as_is, {group, tickets}].
 
 groups() -> 
     [{tickets, [],
-  [hexed_query_otp_6191, empty_body_otp_6243,
-   empty_response_header_otp_6830,
-   transfer_encoding_otp_6807, proxy_not_modified_otp_6821,
-   no_content_204_otp_6982, missing_CR_otp_7304,
-   {group, otp_7883}, {group, otp_8154}, {group, otp_8106},
-   otp_8056, otp_8352, otp_8371, otp_8739]},
- {otp_7883, [], [otp_7883_1, otp_7883_2]},
- {otp_8154, [], [otp_8154_1]},
- {otp_8106, [],
-  [otp_8106_pid, otp_8106_fun, otp_8106_mfa]}].
+      [hexed_query_otp_6191, empty_body_otp_6243,
+       empty_response_header_otp_6830,
+       transfer_encoding_otp_6807, proxy_not_modified_otp_6821,
+       no_content_204_otp_6982, missing_CR_otp_7304,
+       {group, otp_7883}, {group, otp_8154}, {group, otp_8106},
+       otp_8056, otp_8352, otp_8371, otp_8739]},
+     {otp_7883, [], [otp_7883_1, otp_7883_2]},
+     {otp_8154, [], [otp_8154_1]},
+     {otp_8106, [],
+      [otp_8106_pid, otp_8106_fun, otp_8106_mfa]}].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
+
 
- 
 %%--------------------------------------------------------------------
 %% Function: init_per_suite(Config) -> Config
 %% Config - [tuple()]
@@ -211,6 +211,8 @@ init_per_testcase(Case, Timeout, Config) ->
 			tsp("init_per_testcase -> [proxy case] start inets"),
 			inets:start(),
 			tsp("init_per_testcase -> [proxy case] start ssl"),
+			application:start(crypto),
+			application:start(public_key),
 			case (catch application:start(ssl)) of
 			    ok ->
 				[{watchdog, Dog} | TmpConfig];
@@ -1743,7 +1745,7 @@ ipv6(Config) when is_list(Config) ->
     {ok, Hostname} = inet:gethostname(),
     
     case lists:member(list_to_atom(Hostname), 
-		      ?config(ipv6_hosts, Config)) of
+		      ct:get_config(ipv6_hosts)) of
 	true ->
 	    {DummyServerPid, Port} = dummy_server(self(), ipv6),
 	    
diff --git a/lib/inets/test/httpc_cookie_SUITE.erl b/lib/inets/test/httpc_cookie_SUITE.erl
index 685c8cacc4..c4d8a107d1 100644
--- a/lib/inets/test/httpc_cookie_SUITE.erl
+++ b/lib/inets/test/httpc_cookie_SUITE.erl
@@ -119,10 +119,10 @@ end_per_testcase(Case, Config) ->
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[session_cookies_only, netscape_cookies, cookie_cancel,
- cookie_expires, persistent_cookie, domain_cookie,
- secure_cookie, update_cookie, update_cookie_session,
- cookie_attributes].
+    [session_cookies_only, netscape_cookies, cookie_cancel,
+     cookie_expires, persistent_cookie, domain_cookie,
+     secure_cookie, update_cookie, update_cookie_session,
+     cookie_attributes].
 
 groups() -> 
     [].
@@ -134,10 +134,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 %% Test cases starts here.
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index 978ea0f817..02ee2d802e 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -31,16 +31,6 @@
 -export([init_per_testcase/2, end_per_testcase/2,
 	 init_per_suite/1, end_per_suite/1]).
 
-%% Test cases must be exported.
--export([
-	 
-	 
-	 
-	 
-	
-	 
-]).
-
 %% Core Server tests
 -export([
 	 ip_mod_alias/1, 
@@ -251,106 +241,106 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[{group, ip}, {group, ssl}, {group, http_1_1_ip},
- {group, http_1_0_ip}, {group, http_0_9_ip},
- {group, tickets}].
+    [{group, ip}, {group, ssl}, {group, http_1_1_ip},
+     {group, http_1_0_ip}, {group, http_0_9_ip},
+     {group, tickets}].
 
 groups() -> 
     [{ip, [],
-  [ip_mod_alias, ip_mod_actions, ip_mod_security,
-   ip_mod_auth, ip_mod_auth_api, ip_mod_auth_mnesia_api,
-   ip_mod_htaccess, ip_mod_cgi, ip_mod_esi, ip_mod_get,
-   ip_mod_head, ip_mod_all, ip_load_light, ip_load_medium,
-   ip_load_heavy, ip_dos_hostname, ip_time_test,
-   ip_restart_no_block, ip_restart_disturbing_block,
-   ip_restart_non_disturbing_block,
-   ip_block_disturbing_idle, ip_block_non_disturbing_idle,
-   ip_block_503, ip_block_disturbing_active,
-   ip_block_non_disturbing_active,
-   ip_block_disturbing_active_timeout_not_released,
-   ip_block_disturbing_active_timeout_released,
-   ip_block_non_disturbing_active_timeout_not_released,
-   ip_block_non_disturbing_active_timeout_released,
-   ip_block_disturbing_blocker_dies,
-   ip_block_non_disturbing_blocker_dies]},
- {ssl, [],
-  [{group, pssl}, {group, ossl}, {group, essl}]},
- {pssl, [],
-  [pssl_mod_alias, pssl_mod_actions, pssl_mod_security,
-   pssl_mod_auth, pssl_mod_auth_api,
-   pssl_mod_auth_mnesia_api, pssl_mod_htaccess,
-   pssl_mod_cgi, pssl_mod_esi, pssl_mod_get, pssl_mod_head,
-   pssl_mod_all, pssl_load_light, pssl_load_medium,
-   pssl_load_heavy, pssl_dos_hostname, pssl_time_test,
-   pssl_restart_no_block, pssl_restart_disturbing_block,
-   pssl_restart_non_disturbing_block,
-   pssl_block_disturbing_idle,
-   pssl_block_non_disturbing_idle, pssl_block_503,
-   pssl_block_disturbing_active,
-   pssl_block_non_disturbing_active,
-   pssl_block_disturbing_active_timeout_not_released,
-   pssl_block_disturbing_active_timeout_released,
-   pssl_block_non_disturbing_active_timeout_not_released,
-   pssl_block_non_disturbing_active_timeout_released,
-   pssl_block_disturbing_blocker_dies,
-   pssl_block_non_disturbing_blocker_dies]},
- {ossl, [],
-  [ossl_mod_alias, ossl_mod_actions, ossl_mod_security,
-   ossl_mod_auth, ossl_mod_auth_api,
-   ossl_mod_auth_mnesia_api, ossl_mod_htaccess,
-   ossl_mod_cgi, ossl_mod_esi, ossl_mod_get, ossl_mod_head,
-   ossl_mod_all, ossl_load_light, ossl_load_medium,
-   ossl_load_heavy, ossl_dos_hostname, ossl_time_test,
-   ossl_restart_no_block, ossl_restart_disturbing_block,
-   ossl_restart_non_disturbing_block,
-   ossl_block_disturbing_idle,
-   ossl_block_non_disturbing_idle, ossl_block_503,
-   ossl_block_disturbing_active,
-   ossl_block_non_disturbing_active,
-   ossl_block_disturbing_active_timeout_not_released,
-   ossl_block_disturbing_active_timeout_released,
-   ossl_block_non_disturbing_active_timeout_not_released,
-   ossl_block_non_disturbing_active_timeout_released,
-   ossl_block_disturbing_blocker_dies,
-   ossl_block_non_disturbing_blocker_dies]},
- {essl, [],
-  [essl_mod_alias, essl_mod_actions, essl_mod_security,
-   essl_mod_auth, essl_mod_auth_api,
-   essl_mod_auth_mnesia_api, essl_mod_htaccess,
-   essl_mod_cgi, essl_mod_esi, essl_mod_get, essl_mod_head,
-   essl_mod_all, essl_load_light, essl_load_medium,
-   essl_load_heavy, essl_dos_hostname, essl_time_test,
-   essl_restart_no_block, essl_restart_disturbing_block,
-   essl_restart_non_disturbing_block,
-   essl_block_disturbing_idle,
-   essl_block_non_disturbing_idle, essl_block_503,
-   essl_block_disturbing_active,
-   essl_block_non_disturbing_active,
-   essl_block_disturbing_active_timeout_not_released,
-   essl_block_disturbing_active_timeout_released,
-   essl_block_non_disturbing_active_timeout_not_released,
-   essl_block_non_disturbing_active_timeout_released,
-   essl_block_disturbing_blocker_dies,
-   essl_block_non_disturbing_blocker_dies]},
- {http_1_1_ip, [],
-  [ip_host, ip_chunked, ip_expect, ip_range, ip_if_test,
-   ip_http_trace, ip_http1_1_head,
-   ip_mod_cgi_chunked_encoding_test]},
- {http_1_0_ip, [],
-  [ip_head_1_0, ip_get_1_0, ip_post_1_0]},
- {http_0_9_ip, [], [ip_get_0_9]},
- {ipv6, [], [ipv6_hostname, ipv6_address]},
- {tickets, [],
-  [ticket_5775, ticket_5865, ticket_5913, ticket_6003,
-   ticket_7304]}].
+      [ip_mod_alias, ip_mod_actions, ip_mod_security,
+       ip_mod_auth, ip_mod_auth_api, ip_mod_auth_mnesia_api,
+       ip_mod_htaccess, ip_mod_cgi, ip_mod_esi, ip_mod_get,
+       ip_mod_head, ip_mod_all, ip_load_light, ip_load_medium,
+       ip_load_heavy, ip_dos_hostname, ip_time_test,
+       ip_restart_no_block, ip_restart_disturbing_block,
+       ip_restart_non_disturbing_block,
+       ip_block_disturbing_idle, ip_block_non_disturbing_idle,
+       ip_block_503, ip_block_disturbing_active,
+       ip_block_non_disturbing_active,
+       ip_block_disturbing_active_timeout_not_released,
+       ip_block_disturbing_active_timeout_released,
+       ip_block_non_disturbing_active_timeout_not_released,
+       ip_block_non_disturbing_active_timeout_released,
+       ip_block_disturbing_blocker_dies,
+       ip_block_non_disturbing_blocker_dies]},
+     {ssl, [],
+      [{group, pssl}, {group, ossl}, {group, essl}]},
+     {pssl, [],
+      [pssl_mod_alias, pssl_mod_actions, pssl_mod_security,
+       pssl_mod_auth, pssl_mod_auth_api,
+       pssl_mod_auth_mnesia_api, pssl_mod_htaccess,
+       pssl_mod_cgi, pssl_mod_esi, pssl_mod_get, pssl_mod_head,
+       pssl_mod_all, pssl_load_light, pssl_load_medium,
+       pssl_load_heavy, pssl_dos_hostname, pssl_time_test,
+       pssl_restart_no_block, pssl_restart_disturbing_block,
+       pssl_restart_non_disturbing_block,
+       pssl_block_disturbing_idle,
+       pssl_block_non_disturbing_idle, pssl_block_503,
+       pssl_block_disturbing_active,
+       pssl_block_non_disturbing_active,
+       pssl_block_disturbing_active_timeout_not_released,
+       pssl_block_disturbing_active_timeout_released,
+       pssl_block_non_disturbing_active_timeout_not_released,
+       pssl_block_non_disturbing_active_timeout_released,
+       pssl_block_disturbing_blocker_dies,
+       pssl_block_non_disturbing_blocker_dies]},
+     {ossl, [],
+      [ossl_mod_alias, ossl_mod_actions, ossl_mod_security,
+       ossl_mod_auth, ossl_mod_auth_api,
+       ossl_mod_auth_mnesia_api, ossl_mod_htaccess,
+       ossl_mod_cgi, ossl_mod_esi, ossl_mod_get, ossl_mod_head,
+       ossl_mod_all, ossl_load_light, ossl_load_medium,
+       ossl_load_heavy, ossl_dos_hostname, ossl_time_test,
+       ossl_restart_no_block, ossl_restart_disturbing_block,
+       ossl_restart_non_disturbing_block,
+       ossl_block_disturbing_idle,
+       ossl_block_non_disturbing_idle, ossl_block_503,
+       ossl_block_disturbing_active,
+       ossl_block_non_disturbing_active,
+       ossl_block_disturbing_active_timeout_not_released,
+       ossl_block_disturbing_active_timeout_released,
+       ossl_block_non_disturbing_active_timeout_not_released,
+       ossl_block_non_disturbing_active_timeout_released,
+       ossl_block_disturbing_blocker_dies,
+       ossl_block_non_disturbing_blocker_dies]},
+     {essl, [],
+      [essl_mod_alias, essl_mod_actions, essl_mod_security,
+       essl_mod_auth, essl_mod_auth_api,
+       essl_mod_auth_mnesia_api, essl_mod_htaccess,
+       essl_mod_cgi, essl_mod_esi, essl_mod_get, essl_mod_head,
+       essl_mod_all, essl_load_light, essl_load_medium,
+       essl_load_heavy, essl_dos_hostname, essl_time_test,
+       essl_restart_no_block, essl_restart_disturbing_block,
+       essl_restart_non_disturbing_block,
+       essl_block_disturbing_idle,
+       essl_block_non_disturbing_idle, essl_block_503,
+       essl_block_disturbing_active,
+       essl_block_non_disturbing_active,
+       essl_block_disturbing_active_timeout_not_released,
+       essl_block_disturbing_active_timeout_released,
+       essl_block_non_disturbing_active_timeout_not_released,
+       essl_block_non_disturbing_active_timeout_released,
+       essl_block_disturbing_blocker_dies,
+       essl_block_non_disturbing_blocker_dies]},
+     {http_1_1_ip, [],
+      [ip_host, ip_chunked, ip_expect, ip_range, ip_if_test,
+       ip_http_trace, ip_http1_1_head,
+       ip_mod_cgi_chunked_encoding_test]},
+     {http_1_0_ip, [],
+      [ip_head_1_0, ip_get_1_0, ip_post_1_0]},
+     {http_0_9_ip, [], [ip_get_0_9]},
+     {ipv6, [], [ipv6_hostname, ipv6_address]},
+     {tickets, [],
+      [ticket_5775, ticket_5865, ticket_5913, ticket_6003,
+       ticket_7304]}].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
+
 
- 
 %%--------------------------------------------------------------------
 %% Function: init_per_suite(Config) -> Config
 %% Config - [tuple()]
diff --git a/lib/inets/test/httpd_basic_SUITE.erl b/lib/inets/test/httpd_basic_SUITE.erl
index a67a082da9..b52af364d4 100644
--- a/lib/inets/test/httpd_basic_SUITE.erl
+++ b/lib/inets/test/httpd_basic_SUITE.erl
@@ -35,10 +35,10 @@ groups() ->
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 %%--------------------------------------------------------------------
 %% Function: init_per_suite(Config) -> Config
diff --git a/lib/inets/test/inets_SUITE.erl b/lib/inets/test/inets_SUITE.erl
index 593ad2efc6..b67db0a7c5 100644
--- a/lib/inets/test/inets_SUITE.erl
+++ b/lib/inets/test/inets_SUITE.erl
@@ -31,21 +31,21 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[{group, app_test}, {group, appup_test},
- {group, services_test}, httpd_reload].
+    [{group, app_test}, {group, appup_test},
+     {group, services_test}, httpd_reload].
 
 groups() -> 
     [{services_test, [],
-  [start_inets, start_httpc, start_httpd, start_ftpc,
-   start_tftpd]},
- {app_test, [], [{inets_app_test, all}]},
- {appup_test, [], [{inets_appup_test, all}]}].
+      [start_inets, start_httpc, start_httpd, start_ftpc,
+       start_tftpd]},
+     {app_test, [], [{inets_app_test, all}]},
+     {appup_test, [], [{inets_appup_test, all}]}].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 
diff --git a/lib/inets/test/inets_app_test.erl b/lib/inets/test/inets_app_test.erl
index 71f94a4327..11b507fa26 100644
--- a/lib/inets/test/inets_app_test.erl
+++ b/lib/inets/test/inets_app_test.erl
@@ -45,26 +45,25 @@ end_per_testcase(_Case, Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 all() -> 
-Cases = [fields, modules, exportall, app_depend,
-	 undef_funcs],
-	Cases.
+    [fields, modules, exportall, app_depend,
+     undef_funcs].
 
 groups() -> 
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-app_init(suite) -> [];
-app_init(doc) -> [];
-app_init(Config) when is_list(Config) ->
+init_per_suite(suite) -> [];
+init_per_suite(doc) -> [];
+init_per_suite(Config) when is_list(Config) ->
     case is_app(inets) of
 	{ok, AppFile} ->
 	    io:format("AppFile: ~n~p~n", [AppFile]),
@@ -85,9 +84,9 @@ is_app(App) ->
     end.
 
 
-app_fin(suite) -> [];
-app_fin(doc) -> [];
-app_fin(Config) when is_list(Config) ->
+end_per_suite(suite) -> [];
+end_per_suite(doc) -> [];
+end_per_suite(Config) when is_list(Config) ->
     Config.
 
 
diff --git a/lib/inets/test/inets_appup_test.erl b/lib/inets/test/inets_appup_test.erl
index 5065db202e..7ed237243e 100644
--- a/lib/inets/test/inets_appup_test.erl
+++ b/lib/inets/test/inets_appup_test.erl
@@ -28,8 +28,8 @@
 -include("inets_test_lib.hrl").
 
 
-% t()     -> megaco_test_lib:t(?MODULE).
-% t(Case) -> megaco_test_lib:t({?MODULE, Case}).
+						% t()     -> megaco_test_lib:t(?MODULE).
+						% t(Case) -> megaco_test_lib:t({?MODULE, Case}).
 
 
 %% Test server callbacks
@@ -42,24 +42,23 @@ end_per_testcase(_Case, Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 all() -> 
-Cases = [appup],
-	Cases.
+    [appup].
 
 groups() -> 
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-appup_init(suite) -> [];
-appup_init(doc) -> [];
-appup_init(Config) when is_list(Config) ->
+init_per_suite(suite) -> [];
+init_per_suite(doc) -> [];
+init_per_suite(Config) when is_list(Config) ->
     AppFile   = file_name(inets, ".app"),
     AppupFile = file_name(inets, ".appup"),
     [{app_file, AppFile}, {appup_file, AppupFile}|Config].
@@ -70,9 +69,9 @@ file_name(App, Ext) ->
     filename:join([LibDir, "ebin", atom_to_list(App) ++ Ext]).
 
 
-appup_fin(suite) -> [];
-appup_fin(doc) -> [];
-appup_fin(Config) when is_list(Config) ->
+end_per_suite(suite) -> [];
+end_per_suite(doc) -> [];
+end_per_suite(Config) when is_list(Config) ->
     Config.
 
 
diff --git a/lib/inets/test/inets_sup_SUITE.erl b/lib/inets/test/inets_sup_SUITE.erl
index f542506d00..181eb29f7b 100644
--- a/lib/inets/test/inets_sup_SUITE.erl
+++ b/lib/inets/test/inets_sup_SUITE.erl
@@ -29,17 +29,17 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[default_tree, ftpc_worker, tftpd_worker, httpd_subtree,
- httpc_subtree].
+    [default_tree, ftpc_worker, tftpd_worker, httpd_subtree,
+     httpc_subtree].
 
 groups() -> 
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 %%--------------------------------------------------------------------
diff --git a/lib/inets/test/tftp_SUITE.erl b/lib/inets/test/tftp_SUITE.erl
index a53bfa86f4..606b829ca4 100644
--- a/lib/inets/test/tftp_SUITE.erl
+++ b/lib/inets/test/tftp_SUITE.erl
@@ -74,8 +74,8 @@ end_per_testcase(Case, Config) when is_list(Config) ->
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[simple, extra, reuse_connection, resend_client,
- resend_server].
+    [simple, extra, reuse_connection, resend_client,
+     resend_server].
 
 groups() -> 
     [].
@@ -87,10 +87,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%