summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-03-08 14:58:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:52:37 -0500
commit959c4191824347fe207a5996afb0d9aca7c905cb (patch)
treed5fa3a8aad3ff5ffa3aca474981d274d98c1fab3
parent8bec5a464a88b9762d2dbef359aa7b118a65892f (diff)
downloadsamba-959c4191824347fe207a5996afb0d9aca7c905cb.tar.gz
samba-959c4191824347fe207a5996afb0d9aca7c905cb.tar.bz2
samba-959c4191824347fe207a5996afb0d9aca7c905cb.zip
r14039: as samba4 drops the connection on multiple negprot requests
make the BASE-NEGNOWAIT tests more robust. was it correct that the important thing to test in this test is that the 2nd connection works fine? metze (This used to be commit f941e748640fa88eb5868420059efd0c38d7d745)
-rw-r--r--source4/torture/torture.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 2ce51407be..5a86a22133 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -918,18 +918,19 @@ static BOOL run_negprot_nowait(void)
req = smb_raw_negotiate_send(cli->transport, PROTOCOL_NT1);
event_loop_once(cli->transport->socket->event.ctx);
if (req->state == SMBCLI_REQUEST_ERROR) {
- printf("Failed to fill pipe - %s\n", nt_errstr(req->status));
- torture_close_connection(cli);
- return correct;
+ if (i > 0) {
+ printf("Failed to fill pipe packet[%d] - %s (ignored)\n", i+1, nt_errstr(req->status));
+ break;
+ } else {
+ printf("Failed to fill pipe - %s \n", nt_errstr(req->status));
+ torture_close_connection(cli);
+ return False;
+ }
}
}
printf("Opening secondary connection\n");
if (!torture_open_connection(&cli2)) {
- return False;
- }
-
- if (!torture_close_connection(cli)) {
correct = False;
}
@@ -937,6 +938,8 @@ static BOOL run_negprot_nowait(void)
correct = False;
}
+ torture_close_connection(cli);
+
printf("finished negprot nowait test\n");
return correct;