s4-torture: trying to make clusapi resource online/offline testing a bit more robust
authorGünther Deschner <gd@samba.org>
Mon, 21 Sep 2015 17:17:59 +0000 (19:17 +0200)
committerMichael Adam <obnox@samba.org>
Tue, 29 Sep 2015 13:00:47 +0000 (15:00 +0200)
Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Tue Sep 29 15:00:47 CEST 2015 on sn-devel-104

source4/torture/rpc/clusapi.c

index e3fff82174f1d3ff5c0815058028dbd743367247..d59f24fd7a760e92ec42befda338bde8945a0e94 100644 (file)
@@ -946,9 +946,13 @@ bool test_OnlineResource_int(struct torture_context *tctx,
        torture_assert_ntstatus_ok(tctx,
                dcerpc_clusapi_OnlineResource_r(b, tctx, &r),
                "OnlineResource failed");
-       torture_assert_werr_ok(tctx,
-               r.out.result,
-               "OnlineResource failed");
+       if (!W_ERROR_IS_OK(r.out.result) &&
+           !W_ERROR_EQUAL(r.out.result, WERR_IO_PENDING)) {
+               torture_result(tctx, TORTURE_FAIL,
+                              "OnlineResource failed with %s",
+                               win_errstr(r.out.result));
+               return false;
+       }
 
        return true;
 }
@@ -986,9 +990,13 @@ bool test_OfflineResource_int(struct torture_context *tctx,
        torture_assert_ntstatus_ok(tctx,
                dcerpc_clusapi_OfflineResource_r(b, tctx, &r),
                "OfflineResource failed");
-       torture_assert_werr_ok(tctx,
-               r.out.result,
-               "OfflineResource failed");
+       if (!W_ERROR_IS_OK(r.out.result) &&
+           !W_ERROR_EQUAL(r.out.result, WERR_IO_PENDING)) {
+               torture_result(tctx, TORTURE_FAIL,
+                              "OfflineResource failed with %s",
+                              win_errstr(r.out.result));
+               return false;
+       }
 
        return true;
 }