mirror of
https://github.com/samba-team/samba.git
synced 2024-12-22 13:34:15 +03:00
s4:torture: The teardown function should just return
The teardown functions should not return on error but finish cleaning up! 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> Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org> Autobuild-Date(master): Thu Aug 24 13:23:22 CEST 2017 on sn-devel-144
This commit is contained in:
parent
bd44e435fa
commit
c90069b264
@ -8576,6 +8576,7 @@ static bool torture_rpc_spoolss_printer_teardown_common(struct torture_context *
|
||||
struct dcerpc_pipe *p = t->spoolss_pipe;
|
||||
struct dcerpc_binding_handle *b = NULL;
|
||||
const char *server_name_slash;
|
||||
bool ok = true;
|
||||
|
||||
if (p == NULL) {
|
||||
return true;
|
||||
@ -8587,36 +8588,52 @@ static bool torture_rpc_spoolss_printer_teardown_common(struct torture_context *
|
||||
if (!t->wellknown) {
|
||||
const char *printer_name = t->info2.printername;
|
||||
|
||||
torture_assert(tctx,
|
||||
torture_assert_goto(tctx,
|
||||
test_DeletePrinter(tctx, b, &t->handle),
|
||||
ok,
|
||||
remove_driver,
|
||||
"failed to delete printer");
|
||||
|
||||
torture_assert(tctx,
|
||||
torture_assert_goto(tctx,
|
||||
test_EnumPrinters_findname(tctx, b, PRINTER_ENUM_LOCAL, 1,
|
||||
printer_name, &found),
|
||||
ok,
|
||||
remove_driver,
|
||||
"failed to enumerate printers");
|
||||
|
||||
torture_assert(tctx, !found, "deleted printer still there");
|
||||
torture_assert_goto(tctx,
|
||||
!found,
|
||||
ok,
|
||||
remove_driver,
|
||||
"deleted printer still there");
|
||||
}
|
||||
|
||||
|
||||
remove_driver:
|
||||
if (t->added_driver) {
|
||||
torture_assert(tctx,
|
||||
remove_printer_driver(tctx, dcerpc_server_name(p), &t->driver),
|
||||
"failed to remove printer driver");
|
||||
ok = remove_printer_driver(tctx,
|
||||
dcerpc_server_name(p),
|
||||
&t->driver);
|
||||
if (!ok) {
|
||||
torture_warning(tctx,
|
||||
"failed to remove printer driver\n");
|
||||
}
|
||||
|
||||
torture_assert(tctx,
|
||||
test_DeletePrinterDriverEx_exp(tctx, b,
|
||||
ok = test_DeletePrinterDriverEx_exp(tctx, b,
|
||||
server_name_slash,
|
||||
t->driver.info8.driver_name,
|
||||
t->driver.info8.architecture,
|
||||
DPD_DELETE_ALL_FILES,
|
||||
t->driver.info8.version,
|
||||
WERR_OK),
|
||||
"failed to delete printer driver via spoolss");
|
||||
WERR_OK);
|
||||
if (!ok) {
|
||||
torture_warning(tctx,
|
||||
"failed to delete printer driver via "
|
||||
"spoolss\n");
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
return ok;
|
||||
}
|
||||
|
||||
static bool torture_rpc_spoolss_printer_teardown(struct torture_context *tctx, void *data)
|
||||
|
Loading…
Reference in New Issue
Block a user