From 8773e743c518578584d07d35ffdafdd598af88b0 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 16 Oct 2006 13:06:41 +0000 Subject: r19339: Merge my 4.0-unittest branch. This adds an API for more fine-grained output in the testsuite rather than just True or False for a set of tests. The aim is to use this for: * known failure lists (run all tests and detect tests that started working or started failing). This would allow us to get rid of the RPC-SAMBA3-* tests * nicer torture output * simplification of the testsuite system * compatibility with other unit testing systems * easier usage of smbtorture (being able to run one test and automatically set up the environment for that) This is still a work-in-progress; expect more updates over the next couple of days. (This used to be commit 0eb6097305776325c75081356309115f445a7218) --- source4/torture/ldap/common.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'source4/torture/ldap/common.c') diff --git a/source4/torture/ldap/common.c b/source4/torture/ldap/common.c index 5dc482776a..5b28e825f2 100644 --- a/source4/torture/ldap/common.c +++ b/source4/torture/ldap/common.c @@ -101,10 +101,19 @@ NTSTATUS torture_ldap_close(struct ldap_connection *conn) NTSTATUS torture_ldap_init(void) { - register_torture_op("BENCH-CLDAP", torture_bench_cldap); - register_torture_op("LDAP-BASIC", torture_ldap_basic); - register_torture_op("LDAP-SCHEMA", torture_ldap_schema); - register_torture_op("LDAP-CLDAP", torture_cldap); + struct torture_suite *suite = torture_suite_create( + talloc_autofree_context(), + "LDAP"); + torture_suite_add_simple_test(suite, "BENCH-CLDAP", + torture_bench_cldap); + torture_suite_add_simple_test(suite, "BASIC", torture_ldap_basic); + torture_suite_add_simple_test(suite, "CLDAP", torture_cldap); + torture_suite_add_simple_test(suite, "SCHEMA", torture_ldap_schema); + + suite->description = talloc_strdup( + suite, "LDAP and CLDAP tests"); + + torture_register_suite(suite); return NT_STATUS_OK; } -- cgit