diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2006-10-16 13:06:41 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:21:12 -0500 |
commit | 8773e743c518578584d07d35ffdafdd598af88b0 (patch) | |
tree | 89726232dd6ae9eca1c219e21729a9b2336ddaa9 /source4/torture/rpc/wkssvc.c | |
parent | 0f2347e417dec4a50f95d64353b260cd53a44a2b (diff) | |
download | samba-8773e743c518578584d07d35ffdafdd598af88b0.tar.gz samba-8773e743c518578584d07d35ffdafdd598af88b0.tar.bz2 samba-8773e743c518578584d07d35ffdafdd598af88b0.zip |
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)
Diffstat (limited to 'source4/torture/rpc/wkssvc.c')
-rw-r--r-- | source4/torture/rpc/wkssvc.c | 77 |
1 files changed, 27 insertions, 50 deletions
diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c index 4526b3f91b..e99cdada28 100644 --- a/source4/torture/rpc/wkssvc.c +++ b/source4/torture/rpc/wkssvc.c @@ -24,43 +24,37 @@ #include "librpc/gen_ndr/ndr_wkssvc_c.h" #include "torture/rpc/rpc.h" - -static BOOL test_NetWkstaGetInfo(struct dcerpc_pipe *p, - TALLOC_CTX *mem_ctx) +static bool test_NetWkstaGetInfo(struct torture_context *tctx, + struct dcerpc_pipe *p) { NTSTATUS status; struct wkssvc_NetWkstaGetInfo r; union wkssvc_NetWkstaInfo info; uint16_t levels[] = {100, 101, 102, 502}; int i; - BOOL ret = True; r.in.server_name = dcerpc_server_name(p); r.out.info = &info; for (i=0;i<ARRAY_SIZE(levels);i++) { r.in.level = levels[i]; - printf("testing NetWkstaGetInfo level %u\n", r.in.level); - status = dcerpc_wkssvc_NetWkstaGetInfo(p, mem_ctx, &r); - if (!NT_STATUS_IS_OK(status)) { - printf("NetWkstaGetInfo level %u failed - %s\n", r.in.level, nt_errstr(status)); - ret = False; - } - if (!W_ERROR_IS_OK(r.out.result)) { - printf("NetWkstaGetInfo level %u failed - %s\n", r.in.level, win_errstr(r.out.result)); - } + torture_comment(tctx, talloc_asprintf(tctx, "testing NetWkstaGetInfo level %u\n", r.in.level)); + status = dcerpc_wkssvc_NetWkstaGetInfo(p, tctx, &r); + torture_assert_ntstatus_ok(tctx, status, + talloc_asprintf(tctx, "NetWkstaGetInfo level %u failed", r.in.level)); + torture_assert_werr_ok(tctx, r.out.result, + talloc_asprintf(tctx, "NetWkstaGetInfo level %u failed", r.in.level)); } - return ret; + return true; } -static BOOL test_NetWkstaTransportEnum(struct dcerpc_pipe *p, - TALLOC_CTX *mem_ctx) +static bool test_NetWkstaTransportEnum(struct torture_context *tctx, + struct dcerpc_pipe *p) { NTSTATUS status; struct wkssvc_NetWkstaTransportEnum r; - BOOL ret = True; uint32_t resume_handle = 0; union wkssvc_NetWkstaTransportCtr ctr; struct wkssvc_NetWkstaTransportCtr0 ctr0; @@ -76,45 +70,28 @@ static BOOL test_NetWkstaTransportEnum(struct dcerpc_pipe *p, r.out.ctr = &ctr; r.out.resume_handle = &resume_handle; - printf("testing NetWkstaTransportEnum\n"); - status = dcerpc_wkssvc_NetWkstaTransportEnum(p, mem_ctx, &r); - if (!NT_STATUS_IS_OK(status)) { - printf("NetWkstaTransportEnum failed - %s\n", nt_errstr(status)); - ret = False; - } - if (!W_ERROR_IS_OK(r.out.result)) { - printf("NetWkstaTransportEnum level %u failed - %s\n", r.in.level, win_errstr(r.out.result)); - } + status = dcerpc_wkssvc_NetWkstaTransportEnum(p, tctx, &r); + torture_assert_ntstatus_ok(tctx, status, "NetWkstaTransportEnum failed"); + torture_assert_werr_ok(tctx, r.out.result, + talloc_asprintf(tctx, + "NetWkstaTransportEnum level %u failed", r.in.level)); - return ret; + return true; } -BOOL torture_rpc_wkssvc(struct torture_context *torture) +struct torture_suite *torture_rpc_wkssvc(void) { - NTSTATUS status; - struct dcerpc_pipe *p; - TALLOC_CTX *mem_ctx; - BOOL ret = True; - - mem_ctx = talloc_init("torture_rpc_wkssvc"); - - status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_wkssvc); - if (!NT_STATUS_IS_OK(status)) { - talloc_free(mem_ctx); - return False; - } - - if (!test_NetWkstaGetInfo(p, mem_ctx)) { - ret = False; - } - - if (!test_NetWkstaTransportEnum(p, mem_ctx)) { - ret = False; - } + struct torture_suite *suite; + struct torture_tcase *tcase; - talloc_free(mem_ctx); + suite = torture_suite_create(talloc_autofree_context(), "WKSSVC"); + tcase = torture_suite_add_rpc_iface_tcase(suite, "wkssvc", + &dcerpc_table_wkssvc); - return ret; + torture_rpc_tcase_add_test(tcase, "NetWkstaGetInfo", test_NetWkstaGetInfo); + torture_rpc_tcase_add_test(tcase, "NetWkstaTransportEnum", + test_NetWkstaTransportEnum); + return suite; } |