summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-11-27 23:14:27 +0100
committerGünther Deschner <gd@samba.org>2009-11-27 23:16:21 +0100
commit8f6df5d3ec31a8c3dedfdfc506c44e03026d8485 (patch)
treecdcc01e8d921a7574ffd131b11ff96d3b6f65b06
parentf749e22cca79448dbbb338dff30054a87cd5a184 (diff)
downloadsamba-8f6df5d3ec31a8c3dedfdfc506c44e03026d8485.tar.gz
samba-8f6df5d3ec31a8c3dedfdfc506c44e03026d8485.tar.bz2
samba-8f6df5d3ec31a8c3dedfdfc506c44e03026d8485.zip
s4-smbtorture: more and stricter tests for printer and data keys in RPC-SPOOLSS.
Guenther
-rw-r--r--source4/torture/rpc/spoolss.c12
1 files 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;
}