From e12253168c04bfc603afe43670ad214040040b3d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 3 Jan 2011 08:46:14 +0100 Subject: tests: Call init and finalize in client torture tests. --- tests/client/torture_algorithms.c | 9 ++++++++- tests/client/torture_auth.c | 9 ++++++++- tests/client/torture_knownhosts.c | 9 ++++++++- tests/client/torture_proxycommand.c | 9 ++++++++- tests/client/torture_sftp_static.c | 9 ++++++++- 5 files changed, 40 insertions(+), 5 deletions(-) (limited to 'tests/client') diff --git a/tests/client/torture_algorithms.c b/tests/client/torture_algorithms.c index fceec00..a32ea01 100644 --- a/tests/client/torture_algorithms.c +++ b/tests/client/torture_algorithms.c @@ -149,6 +149,10 @@ static void torture_algorithms_zlib_openssh(void **state) { } int torture_run_tests(void) { + int rc; + + ssh_init(); + const UnitTest tests[] = { unit_test_setup_teardown(torture_algorithms_aes128_cbc, setup, teardown), unit_test_setup_teardown(torture_algorithms_aes192_cbc, setup, teardown), @@ -162,5 +166,8 @@ int torture_run_tests(void) { unit_test_setup_teardown(torture_algorithms_zlib_openssh, setup, teardown), }; - return run_tests(tests); + rc = run_tests(tests); + ssh_finalize(); + + return rc; } diff --git a/tests/client/torture_auth.c b/tests/client/torture_auth.c index 774c116..7c90fec 100644 --- a/tests/client/torture_auth.c +++ b/tests/client/torture_auth.c @@ -152,11 +152,18 @@ static void torture_auth_password(void **state) { } int torture_run_tests(void) { + int rc; + + ssh_init(); + const UnitTest tests[] = { unit_test_setup_teardown(torture_auth_kbdint, setup, teardown), unit_test_setup_teardown(torture_auth_password, setup, teardown), unit_test_setup_teardown(torture_auth_autopubkey, setup, teardown), }; - return run_tests(tests); + rc = run_tests(tests); + ssh_finalize(); + + return rc; } diff --git a/tests/client/torture_knownhosts.c b/tests/client/torture_knownhosts.c index 207155d..1bb949e 100644 --- a/tests/client/torture_knownhosts.c +++ b/tests/client/torture_knownhosts.c @@ -92,9 +92,16 @@ static void torture_knownhosts_port(void **state) { } int torture_run_tests(void) { + int rc; + + ssh_init(); + const UnitTest tests[] = { unit_test_setup_teardown(torture_knownhosts_port, setup, teardown), }; - return run_tests(tests); + rc = run_tests(tests); + ssh_finalize(); + + return rc; } diff --git a/tests/client/torture_proxycommand.c b/tests/client/torture_proxycommand.c index ba0e21f..218b457 100644 --- a/tests/client/torture_proxycommand.c +++ b/tests/client/torture_proxycommand.c @@ -41,10 +41,17 @@ static void torture_options_set_proxycommand_notexist(void **state) { } int torture_run_tests(void) { + int rc; + + ssh_init(); + const UnitTest tests[] = { unit_test_setup_teardown(torture_options_set_proxycommand, setup, teardown), unit_test_setup_teardown(torture_options_set_proxycommand_notexist, setup, teardown), }; - return run_tests(tests); + rc = run_tests(tests); + ssh_finalize(); + + return rc; } diff --git a/tests/client/torture_sftp_static.c b/tests/client/torture_sftp_static.c index c6cd979..ba3cfd4 100644 --- a/tests/client/torture_sftp_static.c +++ b/tests/client/torture_sftp_static.c @@ -18,9 +18,16 @@ static void torture_sftp_ext_new(void **state) { } int torture_run_tests(void) { + int rc; + + ssh_init(); + const UnitTest tests[] = { unit_test(torture_sftp_ext_new), }; - return run_tests(tests); + rc = run_tests(tests); + ssh_finalize(); + + return rc; } -- cgit v1.2.3