From: Günther Deschner <gd@samba.org>
Date: Fri, 27 Nov 2009 22:14:27 +0000 (+0100)
Subject: s4-smbtorture: more and stricter tests for printer and data keys in RPC-SPOOLSS.
X-Git-Tag: samba-4.0.0alpha9~86
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=8f6df5d3ec31a8c3dedfdfc506c44e03026d8485;hp=f749e22cca79448dbbb338dff30054a87cd5a184

s4-smbtorture: more and stricter tests for printer and data keys in RPC-SPOOLSS.

Guenther
---

diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 2a74131119e..396ed75d251 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -2139,11 +2139,11 @@ static bool test_EnumPrinterData(struct torture_context *tctx, struct dcerpc_pip
 
 		torture_assert_ntstatus_ok(tctx, status, "EnumPrinterData failed");
 
-		test_GetPrinterData(tctx, p, handle, r.out.value_name);
+		torture_assert(tctx, test_GetPrinterData(tctx, p, handle, r.out.value_name),
+			talloc_asprintf(tctx, "failed to call GetPrinterData for %s\n", r.out.value_name));
 
-		test_GetPrinterDataEx(tctx,
-			p, handle, "PrinterDriverData",
-			r.out.value_name);
+		torture_assert(tctx, test_GetPrinterDataEx(tctx, p, handle, "PrinterDriverData", r.out.value_name),
+			talloc_asprintf(tctx, "failed to call GetPrinterDataEx on PrinterDriverData for %s\n", r.out.value_name));
 
 		r.in.enum_index++;
 
@@ -2439,6 +2439,10 @@ static bool test_OpenPrinterEx(struct torture_context *tctx,
 		ret = false;
 	}
 
+	if (!test_printer_keys(tctx, p, &handle)) {
+		ret = false;
+	}
+
 	if (!test_PausePrinter(tctx, p, &handle)) {
 		ret = false;
 	}