From 3a9dc490b459514c2117572824dca3830c3a9951 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Wed, 17 Feb 2010 11:21:56 +0100 Subject: [PATCH] s4-smbtorture: unify test list to run against single created printers in RPC-SPOOLSS-PRINTER. This is to make sure we run the same tests for printers created via AddPrinter and via AddPrinterEx. Guenther --- source4/torture/rpc/spoolss.c | 46 +++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index 5a603e5412a..0c9c076fda3 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -4322,6 +4322,32 @@ bool test_printer_keys(struct torture_context *tctx, return true; } +static bool test_one_printer(struct torture_context *tctx, + struct dcerpc_pipe *p, + struct policy_handle *handle, + const char *name) +{ + bool ret = true; + + if (!test_printer_info(tctx, p, handle)) { + ret = false; + } + + if (!test_PrinterInfo_SD(tctx, p, handle)) { + ret = false; + } + + if (!test_PrinterInfo_DevMode(tctx, p, handle, name)) { + ret = false; + } + + if (!test_printer_keys(tctx, p, handle)) { + ret = false; + } + + return ret; +} + static bool test_printer(struct torture_context *tctx, struct dcerpc_pipe *p) { @@ -4337,19 +4363,7 @@ static bool test_printer(struct torture_context *tctx, return false; } - if (!test_printer_info(tctx, p, &handle[0])) { - ret = false; - } - - if (!test_PrinterInfo_SD(tctx, p, &handle[0])) { - ret = false; - } - - if (!test_PrinterInfo_DevMode(tctx, p, &handle[0], TORTURE_PRINTER)) { - ret = false; - } - - if (!test_printer_keys(tctx, p, &handle[0])) { + if (!test_one_printer(tctx, p, &handle[0], TORTURE_PRINTER)) { ret = false; } @@ -4370,11 +4384,7 @@ static bool test_printer(struct torture_context *tctx, return false; } - if (!test_printer_info(tctx, p, &handle[1])) { - ret = false; - } - - if (!test_printer_keys(tctx, p, &handle[1])) { + if (!test_one_printer(tctx, p, &handle[1], TORTURE_PRINTER_EX)) { ret = false; } -- 2.34.1