From 83f932257470f5ae01fc61130e997fdea0562653 Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Mon, 6 Dec 2010 16:48:31 +0100 Subject: Add ts_install_scb to suite/0 --- lib/ssl/test/old_ssl_active_SUITE.erl | 4 +++- lib/ssl/test/old_ssl_active_once_SUITE.erl | 4 +++- lib/ssl/test/old_ssl_dist_SUITE.erl | 4 +++- lib/ssl/test/old_ssl_misc_SUITE.erl | 4 +++- lib/ssl/test/old_ssl_passive_SUITE.erl | 4 +++- lib/ssl/test/old_ssl_peer_cert_SUITE.erl | 4 +++- lib/ssl/test/old_ssl_protocol_SUITE.erl | 4 +++- lib/ssl/test/old_ssl_verify_SUITE.erl | 4 +++- lib/ssl/test/old_transport_accept_SUITE.erl | 4 +++- lib/ssl/test/ssl_basic_SUITE.erl | 2 ++ lib/ssl/test/ssl_packet_SUITE.erl | 2 ++ lib/ssl/test/ssl_payload_SUITE.erl | 2 ++ lib/ssl/test/ssl_session_cache_SUITE.erl | 3 ++- lib/ssl/test/ssl_to_openssl_SUITE.erl | 2 ++ 14 files changed, 37 insertions(+), 10 deletions(-) (limited to 'lib/ssl/test') diff --git a/lib/ssl/test/old_ssl_active_SUITE.erl b/lib/ssl/test/old_ssl_active_SUITE.erl index 5eb05ec743..ed2d2de2e5 100644 --- a/lib/ssl/test/old_ssl_active_SUITE.erl +++ b/lib/ssl/test/old_ssl_active_SUITE.erl @@ -20,7 +20,7 @@ %% -module(old_ssl_active_SUITE). --export([all/0,groups/0,init_per_group/2,end_per_group/2, +-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2, config/1, @@ -53,6 +53,8 @@ end_per_testcase(_Case, Config) -> WatchDog = ?config(watchdog, Config), test_server:timetrap_cancel(WatchDog). +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> [cinit_return_chkclose, sinit_return_chkclose, cinit_big_return_chkclose, sinit_big_return_chkclose, diff --git a/lib/ssl/test/old_ssl_active_once_SUITE.erl b/lib/ssl/test/old_ssl_active_once_SUITE.erl index 09e11503bf..8405bcf0de 100644 --- a/lib/ssl/test/old_ssl_active_once_SUITE.erl +++ b/lib/ssl/test/old_ssl_active_once_SUITE.erl @@ -20,7 +20,7 @@ %% -module(old_ssl_active_once_SUITE). --export([all/0,groups/0,init_per_group/2,end_per_group/2, +-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2, config/1, @@ -53,6 +53,8 @@ end_per_testcase(_Case, Config) -> WatchDog = ?config(watchdog, Config), test_server:timetrap_cancel(WatchDog). +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> [server_accept_timeout, cinit_return_chkclose, sinit_return_chkclose, cinit_big_return_chkclose, diff --git a/lib/ssl/test/old_ssl_dist_SUITE.erl b/lib/ssl/test/old_ssl_dist_SUITE.erl index c0f2b45c91..e40ac4d594 100644 --- a/lib/ssl/test/old_ssl_dist_SUITE.erl +++ b/lib/ssl/test/old_ssl_dist_SUITE.erl @@ -35,7 +35,7 @@ -define(AWAIT_SLL_NODE_UP_TIMEOUT, 30000). --export([all/0,groups/0,init_per_group/2,end_per_group/2]). +-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]). -export([init_per_suite/1, end_per_suite/1, init_per_testcase/2, @@ -46,6 +46,8 @@ -record(node_handle, {connection_handler, socket, name, nodename}). +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> [basic]. diff --git a/lib/ssl/test/old_ssl_misc_SUITE.erl b/lib/ssl/test/old_ssl_misc_SUITE.erl index e57960e0d3..cd964b684e 100644 --- a/lib/ssl/test/old_ssl_misc_SUITE.erl +++ b/lib/ssl/test/old_ssl_misc_SUITE.erl @@ -20,7 +20,7 @@ %% -module(old_ssl_misc_SUITE). --export([all/0,groups/0,init_per_group/2,end_per_group/2, +-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2, config/1, @@ -44,6 +44,8 @@ end_per_testcase(_Case, Config) -> WatchDog = ?config(watchdog, Config), test_server:timetrap_cancel(WatchDog). +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> [seed, app]. diff --git a/lib/ssl/test/old_ssl_passive_SUITE.erl b/lib/ssl/test/old_ssl_passive_SUITE.erl index dcaa2ea8d4..59659f5a18 100644 --- a/lib/ssl/test/old_ssl_passive_SUITE.erl +++ b/lib/ssl/test/old_ssl_passive_SUITE.erl @@ -20,7 +20,7 @@ %% -module(old_ssl_passive_SUITE). --export([all/0,groups/0,init_per_group/2,end_per_group/2, +-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2, config/1, @@ -53,6 +53,8 @@ end_per_testcase(_Case, Config) -> WatchDog = ?config(watchdog, Config), test_server:timetrap_cancel(WatchDog). +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> [server_accept_timeout, cinit_return_chkclose, sinit_return_chkclose, cinit_big_return_chkclose, diff --git a/lib/ssl/test/old_ssl_peer_cert_SUITE.erl b/lib/ssl/test/old_ssl_peer_cert_SUITE.erl index cfff5d74b6..522e7fba1f 100644 --- a/lib/ssl/test/old_ssl_peer_cert_SUITE.erl +++ b/lib/ssl/test/old_ssl_peer_cert_SUITE.erl @@ -20,7 +20,7 @@ %% -module(old_ssl_peer_cert_SUITE). --export([all/0,groups/0,init_per_group/2,end_per_group/2, +-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2, config/1, @@ -44,6 +44,8 @@ end_per_testcase(_Case, Config) -> WatchDog = ?config(watchdog, Config), test_server:timetrap_cancel(WatchDog). +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> [cinit_plain, cinit_both_verify, cinit_cnocert]. diff --git a/lib/ssl/test/old_ssl_protocol_SUITE.erl b/lib/ssl/test/old_ssl_protocol_SUITE.erl index 2908de1450..8ced900cab 100644 --- a/lib/ssl/test/old_ssl_protocol_SUITE.erl +++ b/lib/ssl/test/old_ssl_protocol_SUITE.erl @@ -20,7 +20,7 @@ %% -module(old_ssl_protocol_SUITE). --export([all/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2, config/1, +-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2, config/1, finish/1, sslv2/1, sslv3/1, tlsv1/1, sslv2_sslv3/1, sslv2_tlsv1/1, sslv3_tlsv1/1, sslv2_sslv3_tlsv1/1]). @@ -38,6 +38,8 @@ end_per_testcase(_Case, Config) -> WatchDog = ?config(watchdog, Config), test_server:timetrap_cancel(WatchDog). +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> [sslv2, sslv3, tlsv1, sslv2_sslv3, sslv2_tlsv1, sslv3_tlsv1, sslv2_sslv3_tlsv1]. diff --git a/lib/ssl/test/old_ssl_verify_SUITE.erl b/lib/ssl/test/old_ssl_verify_SUITE.erl index e11d41b181..6b3a894a83 100644 --- a/lib/ssl/test/old_ssl_verify_SUITE.erl +++ b/lib/ssl/test/old_ssl_verify_SUITE.erl @@ -20,7 +20,7 @@ %% -module(old_ssl_verify_SUITE). --export([all/0,groups/0,init_per_group/2,end_per_group/2, +-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2, config/1, @@ -43,6 +43,8 @@ end_per_testcase(_Case, Config) -> WatchDog = ?config(watchdog, Config), test_server:timetrap_cancel(WatchDog). +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> [cinit_both_verify, cinit_cnocert]. diff --git a/lib/ssl/test/old_transport_accept_SUITE.erl b/lib/ssl/test/old_transport_accept_SUITE.erl index 39c31922f7..9f6828252b 100644 --- a/lib/ssl/test/old_transport_accept_SUITE.erl +++ b/lib/ssl/test/old_transport_accept_SUITE.erl @@ -26,7 +26,7 @@ -define(default_timeout, ?t:minutes(1)). -define(application, ssh). --export([all/0,groups/0,init_per_group/2,end_per_group/2, +-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2, config/1, @@ -47,6 +47,8 @@ end_per_testcase(_Case, Config) -> WatchDog = ?config(watchdog, Config), test_server:timetrap_cancel(WatchDog). +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> [config, echo_once, echo_twice, close_before_ssl_accept]. diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 56b623d551..e44211b303 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -173,6 +173,8 @@ end_per_testcase(_TestCase, Config) -> %% Name of a test case. %% Description: Returns a list of all test cases in this test suite %%-------------------------------------------------------------------- +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> [app, alerts, connection_info, protocol_versions, empty_protocol_versions, controlling_process, diff --git a/lib/ssl/test/ssl_packet_SUITE.erl b/lib/ssl/test/ssl_packet_SUITE.erl index 3b583b8e4d..a2f94f83b9 100644 --- a/lib/ssl/test/ssl_packet_SUITE.erl +++ b/lib/ssl/test/ssl_packet_SUITE.erl @@ -118,6 +118,8 @@ end_per_testcase(_TestCase, Config) -> %% Name of a test case. %% Description: Returns a list of all test cases in this test suite %%-------------------------------------------------------------------- +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> [packet_raw_passive_many_small, packet_0_passive_many_small, diff --git a/lib/ssl/test/ssl_payload_SUITE.erl b/lib/ssl/test/ssl_payload_SUITE.erl index 1c63006ac3..36eabff202 100644 --- a/lib/ssl/test/ssl_payload_SUITE.erl +++ b/lib/ssl/test/ssl_payload_SUITE.erl @@ -99,6 +99,8 @@ end_per_testcase(_TestCase, Config) -> %% Name of a test case. %% Description: Returns a list of all test cases in this test suite %%-------------------------------------------------------------------- +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> [server_echos_passive_small, server_echos_active_once_small, diff --git a/lib/ssl/test/ssl_session_cache_SUITE.erl b/lib/ssl/test/ssl_session_cache_SUITE.erl index 8b95329bef..9ef8c3bc14 100644 --- a/lib/ssl/test/ssl_session_cache_SUITE.erl +++ b/lib/ssl/test/ssl_session_cache_SUITE.erl @@ -145,6 +145,8 @@ end_per_testcase(_TestCase, Config) -> %% Name of a test case. %% Description: Returns a list of all test cases in this test suite %%-------------------------------------------------------------------- +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> [session_cache_process_list, session_cache_process_mnesia]. @@ -158,7 +160,6 @@ init_per_group(_GroupName, Config) -> end_per_group(_GroupName, Config) -> Config. - session_cache_process_list(doc) -> ["Test reuse of sessions (short handshake)"]; diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index cddf234c2b..b59f1e19d0 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -143,6 +143,8 @@ end_per_testcase(_, Config) -> %% Name of a test case. %% Description: Returns a list of all test cases in this test suite %%-------------------------------------------------------------------- +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> [erlang_client_openssl_server, erlang_server_openssl_client, -- cgit v1.2.3