[ros-diffs] [reactos] 01/01: [WINHTTP_WINETEST] Skip several tests from execution in order to prevent testbot hangs. ROSTESTS-350

[Victor Perevertkin]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0685e02d9ee69ba5ff4d0…

commit 0685e02d9ee69ba5ff4d024d41ec40801d701161
Author:     Victor Perevertkin <victor.perevertkin(a)reactos.org>
AuthorDate: Mon Jan 6 05:36:39 2020 +0300
Commit:     Victor Perevertkin <victor.perevertkin(a)reactos.org>
CommitDate: Mon Jan 6 05:36:39 2020 +0300

    [WINHTTP_WINETEST] Skip several tests from execution in order to prevent
    testbot hangs.
    ROSTESTS-350
---
 modules/rostests/winetests/winhttp/winhttp.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/modules/rostests/winetests/winhttp/winhttp.c
b/modules/rostests/winetests/winhttp/winhttp.c
index 7ed8a527fca..776ee53e379 100644
--- a/modules/rostests/winetests/winhttp/winhttp.c
+++ b/modules/rostests/winetests/winhttp/winhttp.c
@@ -3228,9 +3228,12 @@ static void test_multiple_reads(int port)
     ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0);
     ok(ret, "failed to send request %u\n", GetLastError());
 
+    trace("waiting for response\n");
     ret = WinHttpReceiveResponse(req, NULL);
     ok(ret == TRUE, "expected success\n");
 
+    trace("finished waiting for response\n");
+
     for (;;)
     {
         DWORD len = 0xdeadbeef;
@@ -3249,6 +3252,7 @@ static void test_multiple_reads(int port)
             HeapFree( GetProcessHeap(), 0, buf );
             if (!bytes_read) break;
             total_len += bytes_read;
+            trace("read bytes %u, total_len: %u\n", bytes_read, total_len);
         }
         if (!len) break;
     }
@@ -4880,6 +4884,22 @@ START_TEST (winhttp)
     test_multi_authentication(si.port);
     test_large_data_authentication(si.port);
     test_bad_header(si.port);
+#ifdef __REACTOS__
+    if (!winetest_interactive)
+    {
+        skip("Skipping tests due to hang. See ROSTESTS-350\n");
+    }
+    else
+    {
+        test_multiple_reads(si.port);
+        test_cookies(si.port);
+        test_request_path_escapes(si.port);
+        test_passport_auth(si.port);
+
+        /* send the basic request again to shutdown the server thread */
+        test_basic_request(si.port, NULL, quitW);
+    }
+#else
     test_multiple_reads(si.port);
     test_cookies(si.port);
     test_request_path_escapes(si.port);
@@ -4887,6 +4907,7 @@ START_TEST (winhttp)
 
     /* send the basic request again to shutdown the server thread */
     test_basic_request(si.port, NULL, quitW);
+#endif
 
     WaitForSingleObject(thread, 3000);
     CloseHandle(thread);