sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

s4:torture: Delete printer before we remove the driver

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12984

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
This commit is contained in:
Andreas Schneider 2017-08-08 10:40:19 +02:00 committed by Andreas Schneider
parent 731fe596ac
commit bd44e435fa
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source4/torture/rpc/spoolss.c
View File

@ -8584,6 +8584,22 @@ static bool torture_rpc_spoolss_printer_teardown_common(struct torture_context *
server_name_slash = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
if (!t->wellknown) {
const char *printer_name = t->info2.printername;
torture_assert(tctx,
test_DeletePrinter(tctx, b, &t->handle),
"failed to delete printer");
torture_assert(tctx,
test_EnumPrinters_findname(tctx, b, PRINTER_ENUM_LOCAL, 1,
printer_name, &found),
"failed to enumerate printers");
torture_assert(tctx, !found, "deleted printer still there");
}
if (t->added_driver) {
torture_assert(tctx,
remove_printer_driver(tctx, dcerpc_server_name(p), &t->driver),
@ -8600,21 +8616,6 @@ static bool torture_rpc_spoolss_printer_teardown_common(struct torture_context *
"failed to delete printer driver via spoolss");
}
if (!t->wellknown) {
const char *printer_name = t->info2.printername;
torture_assert(tctx,
test_DeletePrinter(tctx, b, &t->handle),
"failed to delete printer");
torture_assert(tctx,
test_EnumPrinters_findname(tctx, b, PRINTER_ENUM_LOCAL, 1,
printer_name, &found),
"failed to enumerate printers");
torture_assert(tctx, !found, "deleted printer still there");
}
return true;
}