From 582d46ec42144bddccddacadd52a0256f58cb453 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 16 Jun 2006 22:06:09 +0000 Subject: r16304: Improve testing UI API. This now allows registering the full test suite tree, looks a bit more like other unit testing API's, fixes some memory responsibility issues, introduces testcases, and removes the need for tests to call torture_ok(). (This used to be commit 0445b1a56a02552f895f400960b9ced39244a144) --- source4/torture/rpc/samr.c | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) (limited to 'source4/torture/rpc') diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index 6e21ff595f..57e50009b4 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -3368,45 +3368,27 @@ static BOOL test_Connect(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, BOOL torture_rpc_samr(struct torture_context *torture) { - NTSTATUS status; - struct dcerpc_pipe *p; - TALLOC_CTX *mem_ctx; + NTSTATUS status; + struct dcerpc_pipe *p; BOOL ret = True; struct policy_handle handle; - mem_ctx = talloc_init("torture_rpc_samr"); - - status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_samr); + status = torture_rpc_connection(torture, &p, &dcerpc_table_samr); if (!NT_STATUS_IS_OK(status)) { - talloc_free(mem_ctx); return False; } - if (!test_Connect(p, mem_ctx, &handle)) { - ret = False; - } + ret &= test_Connect(p, torture, &handle); - if (!test_QuerySecurity(p, mem_ctx, &handle)) { - ret = False; - } - - if (!test_EnumDomains(p, mem_ctx, &handle)) { - ret = False; - } + ret &= test_QuerySecurity(p, torture, &handle); - if (!test_SetDsrmPassword(p, mem_ctx, &handle)) { - ret = False; - } + ret &= test_EnumDomains(p, torture, &handle); - if (!test_Shutdown(p, mem_ctx, &handle)) { - ret = False; - } + ret &= test_SetDsrmPassword(p, torture, &handle); - if (!test_samr_handle_Close(p, mem_ctx, &handle)) { - ret = False; - } + ret &= test_Shutdown(p, torture, &handle); - talloc_free(mem_ctx); + ret &= test_samr_handle_Close(p, torture, &handle); return ret; } -- cgit