s4-torture: use torture_assert macros for RemoteActivation test.
authorGünther Deschner <gd@samba.org>
Tue, 21 Jul 2015 18:35:14 +0000 (20:35 +0200)
committerJeremy Allison <jra@samba.org>
Thu, 30 Jul 2015 23:55:28 +0000 (01:55 +0200)
Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source4/torture/rpc/oxidresolve.c

index 9c679887c3e9479c73a95c325b6828a1605a71a1..e3fa80b3c6bc0265ab7a3ea0b433cbd3e332c77b 100644 (file)
@@ -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;
 }