From 0cf5c8992533354e12c475a6749a2de0ad7bd06d Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Tue, 21 Jul 2015 20:35:14 +0200 Subject: [PATCH] s4-torture: use torture_assert macros for RemoteActivation test. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Guenther Signed-off-by: Günther Deschner Reviewed-by: Jeremy Allison --- source4/torture/rpc/oxidresolve.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c index 9c679887c3e..e3fa80b3c6b 100644 --- a/source4/torture/rpc/oxidresolve.c +++ b/source4/torture/rpc/oxidresolve.c @@ -63,25 +63,10 @@ static bool test_RemoteActivation(struct torture_context *tctx, r.out.ipidRemUnknown = oid; status = dcerpc_RemoteActivation_r(b, tctx, &r); - if(NT_STATUS_IS_ERR(status)) { - fprintf(stderr, "RemoteActivation: %s\n", nt_errstr(status)); - return false; - } - - if(!W_ERROR_IS_OK(r.out.result)) { - fprintf(stderr, "RemoteActivation: %s\n", win_errstr(r.out.result)); - return false; - } - - if(!W_ERROR_IS_OK(*r.out.hr)) { - fprintf(stderr, "RemoteActivation: %s\n", win_errstr(*r.out.hr)); - return false; - } - - if(!W_ERROR_IS_OK(r.out.results[0])) { - fprintf(stderr, "RemoteActivation: %s\n", win_errstr(r.out.results[0])); - return false; - } + torture_assert_ntstatus_ok(tctx, status, "RemoteActivation failed"); + torture_assert_werr_ok(tctx, r.out.result, "RemoteActivation failed"); + torture_assert_werr_ok(tctx, *r.out.hr, "RemoteActivation failed"); + torture_assert_werr_ok(tctx, r.out.results[0], "RemoteActivation failed"); return true; } -- 2.11.4.GIT