From: Günther Deschner <gd@samba.org>
Date: Sat, 8 May 2010 23:08:11 +0000 (+0200)
Subject: s4-smbtorture: getting serious about checking rap status return codes.
X-Git-Tag: samba-3.6.0pre1~2078
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84ab762fd55c1f02ec0e810813b51a0cae32b62b;p=thirdparty%2Fsamba.git

s4-smbtorture: getting serious about checking rap status return codes.

Guenther
---

diff --git a/source4/torture/rap/printing.c b/source4/torture/rap/printing.c
index e18378d5c27..a8a30366cf0 100644
--- a/source4/torture/rap/printing.c
+++ b/source4/torture/rap/printing.c
@@ -89,6 +89,8 @@ static bool test_netprintqenum(struct torture_context *tctx,
 		torture_assert_ntstatus_ok(tctx,
 			smbcli_rap_netprintqenum(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
 			"smbcli_rap_netprintqenum failed");
+		torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+			"failed to enum printq");
 
 		for (q=0; q<r.out.count; q++) {
 			switch (r.in.level) {
@@ -116,6 +118,8 @@ static bool test_netprintqgetinfo(struct torture_context *tctx,
 	torture_assert_ntstatus_ok(tctx,
 		smbcli_rap_netprintqenum(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r_enum),
 		"failed to enum printq");
+	torture_assert_werr_ok(tctx, W_ERROR(r_enum.out.status),
+		"failed to enum printq");
 
 	for (p=0; p < r_enum.out.count; p++) {
 
@@ -225,6 +229,8 @@ static bool test_netprintq_pause(struct torture_context *tctx,
 	torture_assert_ntstatus_ok(tctx,
 		smbcli_rap_netprintqueuepause(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
 		"smbcli_rap_netprintqueuepause failed");
+	torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+		"smbcli_rap_netprintqueuepause failed");
 
 	return true;
 }
@@ -242,6 +248,8 @@ static bool test_netprintq_resume(struct torture_context *tctx,
 	torture_assert_ntstatus_ok(tctx,
 		smbcli_rap_netprintqueueresume(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
 		"smbcli_rap_netprintqueueresume failed");
+	torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+		"smbcli_rap_netprintqueueresume failed");
 
 	return true;
 }
@@ -258,6 +266,8 @@ static bool test_netprintq(struct torture_context *tctx,
 	torture_assert_ntstatus_ok(tctx,
 		smbcli_rap_netprintqenum(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
 		"failed to enum printq");
+	torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+		"failed to enum printq");
 
 	for (i=0; i < r.out.count; i++) {
 
@@ -447,6 +457,8 @@ static bool test_netprintjobenum(struct torture_context *tctx,
 	torture_assert_ntstatus_ok(tctx,
 		smbcli_rap_netprintqenum(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
 		"failed to enum printq");
+	torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+		"failed to enum printq");
 
 	for (i=0; i < r.out.count; i++) {
 
@@ -472,6 +484,8 @@ static bool test_netprintjobgetinfo(struct torture_context *tctx,
 	torture_assert_ntstatus_ok(tctx,
 		smbcli_rap_netprintqenum(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
 		"failed to enum printq");
+	torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+		"failed to enum printq");
 
 	for (i=0; i < r.out.count; i++) {
 
@@ -497,6 +511,8 @@ static bool test_netprintjobsetinfo(struct torture_context *tctx,
 	torture_assert_ntstatus_ok(tctx,
 		smbcli_rap_netprintqenum(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
 		"failed to enum printq");
+	torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+		"failed to enum printq");
 
 	for (i=0; i < r.out.count; i++) {
 
@@ -598,6 +614,8 @@ static bool test_rap_print(struct torture_context *tctx,
 	torture_assert_ntstatus_ok(tctx,
 		smbcli_rap_netprintqenum(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
 		"failed to enum printq");
+	torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+		"failed to enum printq");
 
 	for (i=0; i < r.out.count; i++) {