sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-25 17:57:42 +03:00
Code

s4-smbtorture: make all smbcli_rap_* failures critical.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner 2010-05-03 20:53:02 +02:00
parent 6dafd5f8c7
commit dda0ebd0ac
1 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
source4/torture/rap/printing.c
View File

@ -69,7 +69,6 @@ static bool test_netprintqenum(struct torture_context *tctx,
struct rap_NetPrintQEnum r; struct rap_NetPrintQEnum r;
int i, q; int i, q;
uint16_t levels[] = { 0, 1, 2, 3, 4, 5 }; uint16_t levels[] = { 0, 1, 2, 3, 4, 5 };
NTSTATUS status;
for (i=0; i < ARRAY_SIZE(levels); i++) { for (i=0; i < ARRAY_SIZE(levels); i++) {
@ -79,11 +78,9 @@ static bool test_netprintqenum(struct torture_context *tctx,
torture_comment(tctx, torture_comment(tctx,
"Testing rap_NetPrintQEnum level %d\n", r.in.level); "Testing rap_NetPrintQEnum level %d\n", r.in.level);
status = smbcli_rap_netprintqenum(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r); torture_assert_ntstatus_ok(tctx,
if (!NT_STATUS_IS_OK(status)) { smbcli_rap_netprintqenum(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
torture_warning(tctx, "smbcli_rap_netprintqenum failed with %s\n", nt_errstr(status)); "smbcli_rap_netprintqenum failed");
continue;
}
for (q=0; q<r.out.count; q++) { for (q=0; q<r.out.count; q++) {
switch (r.in.level) { switch (r.in.level) {
@ -104,7 +101,6 @@ static bool test_netprintqgetinfo(struct torture_context *tctx,
struct rap_NetPrintQEnum r_enum; struct rap_NetPrintQEnum r_enum;
int i, p; int i, p;
uint16_t levels[] = { 0, 1, 2, 3, 4, 5 }; uint16_t levels[] = { 0, 1, 2, 3, 4, 5 };
NTSTATUS status;
r_enum.in.level = 5; r_enum.in.level = 5;
r_enum.in.bufsize = 8192; r_enum.in.bufsize = 8192;
@ -124,11 +120,9 @@ static bool test_netprintqgetinfo(struct torture_context *tctx,
torture_comment(tctx, "Testing rap_NetPrintQGetInfo(%s) level %d\n", torture_comment(tctx, "Testing rap_NetPrintQGetInfo(%s) level %d\n",
r.in.PrintQueueName, r.in.level); r.in.PrintQueueName, r.in.level);
status = smbcli_rap_netprintqgetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r); torture_assert_ntstatus_ok(tctx,
if (!NT_STATUS_IS_OK(status)) { smbcli_rap_netprintqgetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
torture_warning(tctx, "smbcli_rap_netprintqgetinfo failed with %s\n", nt_errstr(status)); "smbcli_rap_netprintqgetinfo failed");
continue;
}
switch (r.in.level) { switch (r.in.level) {
case 0: case 0:
@ -280,7 +274,6 @@ static bool test_netprintjobenum_one(struct torture_context *tctx,
struct rap_NetPrintJobEnum r; struct rap_NetPrintJobEnum r;
int i; int i;
uint16_t levels[] = { 0, 1, 2 }; uint16_t levels[] = { 0, 1, 2 };
NTSTATUS status;
r.in.PrintQueueName = PrintQueueName; r.in.PrintQueueName = PrintQueueName;
r.in.bufsize = 8192; r.in.bufsize = 8192;
@ -292,11 +285,9 @@ static bool test_netprintjobenum_one(struct torture_context *tctx,
torture_comment(tctx, torture_comment(tctx,
"Testing rap_NetPrintJobEnum(%s) level %d\n", r.in.PrintQueueName, r.in.level); "Testing rap_NetPrintJobEnum(%s) level %d\n", r.in.PrintQueueName, r.in.level);
status = smbcli_rap_netprintjobenum(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r); torture_assert_ntstatus_ok(tctx,
if (!NT_STATUS_IS_OK(status)) { smbcli_rap_netprintjobenum(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
torture_warning(tctx, "smbcli_rap_netprintjobenum failed with %s\n", nt_errstr(status)); "smbcli_rap_netprintjobenum failed");
continue;
}
} }
return true; return true;
@ -308,7 +299,6 @@ static bool test_netprintjobgetinfo_byid(struct torture_context *tctx,
{ {
struct rap_NetPrintJobGetInfo r; struct rap_NetPrintJobGetInfo r;
uint16_t levels[] = { 0, 1, 2 }; uint16_t levels[] = { 0, 1, 2 };
NTSTATUS status;
int i; int i;
r.in.JobID = JobID; r.in.JobID = JobID;
@ -320,11 +310,9 @@ static bool test_netprintjobgetinfo_byid(struct torture_context *tctx,
torture_comment(tctx, "Testing rap_NetPrintJobGetInfo(%d) level %d\n", r.in.JobID, r.in.level); torture_comment(tctx, "Testing rap_NetPrintJobGetInfo(%d) level %d\n", r.in.JobID, r.in.level);
status = smbcli_rap_netprintjobgetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r); torture_assert_ntstatus_ok(tctx,
if (!NT_STATUS_IS_OK(status)) { smbcli_rap_netprintjobgetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
torture_warning(tctx, "smbcli_rap_netprintjobgetinfo failed with %s\n", nt_errstr(status)); "smbcli_rap_netprintjobgetinfo failed");
continue;
}
} }
return true; return true;
@ -336,7 +324,6 @@ static bool test_netprintjobsetinfo_byid(struct torture_context *tctx,
{ {
struct rap_NetPrintJobSetInfo r; struct rap_NetPrintJobSetInfo r;
uint16_t levels[] = { 0, 1, 2 }; uint16_t levels[] = { 0, 1, 2 };
NTSTATUS status;
int i; int i;
const char *comment = "tortured by samba"; const char *comment = "tortured by samba";
@ -351,11 +338,9 @@ static bool test_netprintjobsetinfo_byid(struct torture_context *tctx,
torture_comment(tctx, "Testing rap_NetPrintJobSetInfo(%d) level %d\n", r.in.JobID, r.in.level); torture_comment(tctx, "Testing rap_NetPrintJobSetInfo(%d) level %d\n", r.in.JobID, r.in.level);
status = smbcli_rap_netprintjobsetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r); torture_assert_ntstatus_ok(tctx,
if (!NT_STATUS_IS_OK(status)) { smbcli_rap_netprintjobsetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
torture_warning(tctx, "smbcli_rap_netprintjobsetinfo failed with %s\n", nt_errstr(status)); "smbcli_rap_netprintjobsetinfo failed");
continue;
}
} }
return true; return true;