Paul Gofman : ntoskrnl/tests: Retry bind if address is in use in test_wsk_listen_socket().
Alexandre Julliard
julliard at winehq.org
Tue Jun 23 15:52:52 CDT 2020
Module: wine
Branch: master
Commit: 8f80ea670da76bca4b5f915d86b91575010e4979
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f80ea670da76bca4b5f915d86b91575010e4979
Author: Paul Gofman <pgofman at codeweavers.com>
Date: Tue Jun 23 00:27:04 2020 +0300
ntoskrnl/tests: Retry bind if address is in use in test_wsk_listen_socket().
Fixes test failures occuring when the tests using the same ports run closely
one after another.
Signed-off-by: Paul Gofman <pgofman at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntoskrnl.exe/tests/driver4.c | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c
index e11879e9e5..5307674de3 100644
--- a/dlls/ntoskrnl.exe/tests/driver4.c
+++ b/dlls/ntoskrnl.exe/tests/driver4.c
@@ -265,19 +265,25 @@ static void test_wsk_listen_socket(void)
ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status);
ok(wsk_irp->IoStatus.Status == STATUS_SUCCESS, "Got unexpected status %#x.\n", wsk_irp->IoStatus.Status);
- IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL);
- IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE);
- wsk_irp->IoStatus.Status = 0xdeadbeef;
- wsk_irp->IoStatus.Information = 0xdeadbeef;
- status = tcp_dispatch->WskBind(tcp_socket, (SOCKADDR *)&addr, 0, wsk_irp);
- ok(status == STATUS_PENDING, "Got unexpected status %#x.\n", status);
- status = KeWaitForSingleObject(&irp_complete_event, Executive, KernelMode, FALSE, NULL);
- ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status);
- ok(wsk_irp->IoStatus.Status == STATUS_SUCCESS, "Got unexpected status %#x.\n", wsk_irp->IoStatus.Status);
- ok(!wsk_irp->IoStatus.Information, "Got unexpected Information %#lx.\n",
- wsk_irp->IoStatus.Information);
+ do
+ {
+ IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL);
+ IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE);
+ wsk_irp->IoStatus.Status = 0xdeadbeef;
+ wsk_irp->IoStatus.Information = 0xdeadbeef;
+ status = tcp_dispatch->WskBind(tcp_socket, (SOCKADDR *)&addr, 0, wsk_irp);
+ ok(status == STATUS_PENDING, "Got unexpected status %#x.\n", status);
+ status = KeWaitForSingleObject(&irp_complete_event, Executive, KernelMode, FALSE, NULL);
+ ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status);
+ ok(wsk_irp->IoStatus.Status == STATUS_SUCCESS
+ || wsk_irp->IoStatus.Status == STATUS_ADDRESS_ALREADY_ASSOCIATED,
+ "Got unexpected status %#x.\n", wsk_irp->IoStatus.Status);
+ ok(!wsk_irp->IoStatus.Information, "Got unexpected Information %#lx.\n",
+ wsk_irp->IoStatus.Information);
+ }
+ while (wsk_irp->IoStatus.Status == STATUS_ADDRESS_ALREADY_ASSOCIATED);
- timeout.QuadPart = -1000 * 10000;
+ timeout.QuadPart = -2000 * 10000;
IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL);
IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE);
More information about the wine-cvs
mailing list