From: Günther Deschner <gd@samba.org>
Date: Mon, 21 Sep 2015 17:17:59 +0000 (+0200)
Subject: s4-torture: trying to make clusapi resource online/offline testing a bit more robust
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=ae438675ddabbec7438ec90565d93a7e9ee86f82;p=obnox%2Fsamba%2Fsamba-obnox.git

s4-torture: trying to make clusapi resource online/offline testing a bit more robust

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
---

diff --git a/source4/torture/rpc/clusapi.c b/source4/torture/rpc/clusapi.c
index e3fff82174f..d59f24fd7a7 100644
--- a/source4/torture/rpc/clusapi.c
+++ b/source4/torture/rpc/clusapi.c
@@ -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;
 }