From 8f6df5d3ec31a8c3dedfdfc506c44e03026d8485 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 27 Nov 2009 23:14:27 +0100 Subject: s4-smbtorture: more and stricter tests for printer and data keys in RPC-SPOOLSS. Guenther --- source4/torture/rpc/spoolss.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index 2a74131119..396ed75d25 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; } -- cgit