Jacek Caban : wininet: Get rid of test_http1_1 test.

Alexandre Julliard julliard at wine.codeweavers.com
Sat May 14 10:07:28 CDT 2016


Module: wine
Branch: master
Commit: 1d834438ca1a490ab7e3725c6dbed17461790b92
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1d834438ca1a490ab7e3725c6dbed17461790b92

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri May 13 18:48:23 2016 +0200

wininet: Get rid of test_http1_1 test.

I can only guess what author meant to test, but those are useless in
their current shape and we already have better persistent connection
tests anyway.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wininet/tests/http.c | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index b09f20d..1b4ce3b 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -2041,7 +2041,6 @@ static DWORD CALLBACK server_thread(LPVOID param)
     int last_request = 0;
     char host_header[22];
     char host_header_override[30];
-    static BOOL test_b = FALSE;
     static int test_no_cache = 0;
 
     WSAStartup(MAKEWORD(1,1), &wsaData);
@@ -2190,13 +2189,6 @@ static DWORD CALLBACK server_thread(LPVOID param)
             else
                 send(c, notokmsg, sizeof notokmsg-1, 0);
         }
-        if (!test_b && strstr(buffer, "/testB HTTP/1.1"))
-        {
-            test_b = TRUE;
-            send(c, okmsg, sizeof okmsg-1, 0);
-            recvfrom(c, buffer, sizeof buffer, 0, NULL, NULL);
-            send(c, okmsg, sizeof okmsg-1, 0);
-        }
         if (strstr(buffer, "/testC"))
         {
             if (strstr(buffer, "Cookie: cookie=biscuit"))
@@ -3098,37 +3090,6 @@ static void test_header_override(int port)
     InternetCloseHandle(ses);
 }
 
-static void test_http1_1(int port)
-{
-    HINTERNET ses, con, req;
-    BOOL ret;
-
-    ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0);
-    ok(ses != NULL, "InternetOpen failed\n");
-
-    con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0);
-    ok(con != NULL, "InternetConnect failed\n");
-
-    req = HttpOpenRequestA(con, NULL, "/testB", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0);
-    ok(req != NULL, "HttpOpenRequest failed\n");
-
-    ret = HttpSendRequestA(req, NULL, 0, NULL, 0);
-    if (ret)
-    {
-        InternetCloseHandle(req);
-
-        req = HttpOpenRequestA(con, NULL, "/testB", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0);
-        ok(req != NULL, "HttpOpenRequest failed\n");
-
-        ret = HttpSendRequestA(req, NULL, 0, NULL, 0);
-        ok(ret, "HttpSendRequest failed\n");
-    }
-
-    InternetCloseHandle(req);
-    InternetCloseHandle(con);
-    InternetCloseHandle(ses);
-}
-
 static void test_connection_closing(int port)
 {
     HINTERNET session, connection, req;
@@ -4840,7 +4801,6 @@ static void test_http_connection(void)
     test_basic_request(si.port, "GET", "/testF");
     test_connection_header(si.port);
     test_header_override(si.port);
-    test_http1_1(si.port);
     test_cookie_header(si.port);
     test_basic_authentication(si.port);
     test_invalid_response_headers(si.port);




More information about the wine-cvs mailing list