ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winhttp/tests: Use a wait event instead of an unconditional sleep in the server thread.

This commit is contained in:
Hans Leidekker 2015-01-05 13:18:15 +01:00 committed by Alexandre Julliard
parent 1c21aeeebc
commit 823c037c9f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/winhttp/tests/winhttp.c
View File

@ -31,6 +31,7 @@
#include "wine/test.h" #include "wine/test.h"
static HANDLE wait_event;
static const WCHAR test_useragent[] = static const WCHAR test_useragent[] =
{'W','i','n','e',' ','R','e','g','r','e','s','s','i','o','n',' ','T','e','s','t',0}; {'W','i','n','e',' ','R','e','g','r','e','s','s','i','o','n',' ','T','e','s','t',0};
static const WCHAR test_winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR test_winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0};
@ -1901,7 +1902,7 @@ static DWORD CALLBACK server_thread(LPVOID param)
if (strstr(buffer, "GET /not_modified")) if (strstr(buffer, "GET /not_modified"))
{ {
send(c, notmodified, sizeof notmodified - 1, 0); send(c, notmodified, sizeof notmodified - 1, 0);
Sleep(6000); WaitForSingleObject(wait_event, 5000);
} }
if (strstr(buffer, "GET /quit")) if (strstr(buffer, "GET /quit"))
{ {
@ -2249,6 +2250,8 @@ static void test_not_modified(int port)
ret = WinHttpReceiveResponse(request, NULL); ret = WinHttpReceiveResponse(request, NULL);
ok(ret, "WinHttpReceiveResponse failed: %u\n", GetLastError()); ok(ret, "WinHttpReceiveResponse failed: %u\n", GetLastError());
SetEvent(wait_event);
size = sizeof(status); size = sizeof(status);
ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER,
NULL, &status, &size, NULL); NULL, &status, &size, NULL);
@ -3272,6 +3275,8 @@ START_TEST (winhttp)
if (ret != WAIT_OBJECT_0) if (ret != WAIT_OBJECT_0)
return; return;
wait_event = CreateEventW(NULL, FALSE, FALSE, NULL);
test_connection_info(si.port); test_connection_info(si.port);
test_basic_request(si.port, NULL, basicW); test_basic_request(si.port, NULL, basicW);
test_no_headers(si.port); test_no_headers(si.port);
@ -3284,5 +3289,7 @@ START_TEST (winhttp)
/* send the basic request again to shutdown the server thread */ /* send the basic request again to shutdown the server thread */
test_basic_request(si.port, NULL, quitW); test_basic_request(si.port, NULL, quitW);
CloseHandle(wait_event);
WaitForSingleObject(thread, 3000); WaitForSingleObject(thread, 3000);
} }