[PATCH] wininet/tests: Remove some unnecessary traces from the http test.

[Francois Gouget]

Signed-off-by: Francois Gouget 
---
Saves a bit over 2kB of traces.
---
 dlls/wininet/tests/http.c | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index 4f3ffa89971..25c3ab327ff 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -596,11 +596,9 @@ static void InternetReadFile_test(int flags, const test_data_t *test)
     trace("Starting InternetReadFile test with flags 0x%x on url %s\n",flags,test->url);
     reset_events();

-    trace("InternetOpenA <--\n");
     hi = InternetOpenA((test->flags & TESTF_COMPRESSED) ? "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)" : "",
             INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, flags);
     ok((hi != 0x0),"InternetOpen failed with error %u\n", GetLastError());
-    trace("InternetOpenA -->\n");

if (hi == 0x0) goto abort;

@@ -608,18 +606,15 @@ static void InternetReadFile_test(int flags, const test_data_t *test)

SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED);

-    trace("InternetConnectA <--\n");
     hic=InternetConnectA(hi, test->host, INTERNET_INVALID_PORT_NUMBER,
                          NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef);
     ok((hic != 0x0),"InternetConnect failed with error %u\n", GetLastError());
-    trace("InternetConnectA -->\n");

if (hic == 0x0) goto abort;

CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED);
     SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED);

-    trace("HttpOpenRequestA <--\n");
     hor = HttpOpenRequestA(hic, test->post_data ? "POST" : "GET", test->path, NULL, NULL, types,
                            INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RELOAD,
                            0xdeadbead);
@@ -633,7 +628,6 @@ static void InternetReadFile_test(int flags, const test_data_t *test)
     } else  {
         ok((hor != 0x0),"HttpOpenRequest failed with error %u\n", GetLastError());
     }
-    trace("HttpOpenRequestA -->\n");

if (hor == 0x0) goto abort;

@@ -684,7 +678,6 @@ static void InternetReadFile_test(int flags, const test_data_t *test)

test_status_code(hor, 0);

-    trace("HttpSendRequestA -->\n");
     if(test->post_data) {
         post_len = strlen(test->post_data);
         post_data = HeapAlloc(GetProcessHeap(), 0, post_len);
@@ -698,7 +691,6 @@ static void InternetReadFile_test(int flags, const test_data_t *test)
     else
         ok(res || (GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED),
            "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError());
-    trace("HttpSendRequestA <--\n");

if (flags & INTERNET_FLAG_ASYNC) {
         WaitForSingleObject(complete_event, INFINITE);
@@ -968,22 +960,17 @@ static void InternetReadFile_chunked_test(void)

trace("Starting InternetReadFile chunked test\n");

-    trace("InternetOpenA <--\n");
     hi = InternetOpenA("", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0);
     ok((hi != 0x0),"InternetOpen failed with error %u\n", GetLastError());
-    trace("InternetOpenA -->\n");

if (hi == 0x0) goto abort;

-    trace("InternetConnectA <--\n");
     hic=InternetConnectA(hi, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER,
                          NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef);
     ok((hic != 0x0),"InternetConnect failed with error %u\n", GetLastError());
-    trace("InternetConnectA -->\n");

if (hic == 0x0) goto abort;

-    trace("HttpOpenRequestA <--\n");
     hor = HttpOpenRequestA(hic, "GET", "/tests/chunked", NULL, NULL, types,
                            INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RELOAD,
                            0xdeadbead);
@@ -997,16 +984,13 @@ static void InternetReadFile_chunked_test(void)
     } else  {
         ok((hor != 0x0),"HttpOpenRequest failed with error %u\n", GetLastError());
     }
-    trace("HttpOpenRequestA -->\n");

if (hor == 0x0) goto abort;

-    trace("HttpSendRequestA -->\n");
     SetLastError(0xdeadbeef);
     res = HttpSendRequestA(hor, "", -1, NULL, 0);
     ok(res || (GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED),
        "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError());
-    trace("HttpSendRequestA <--\n");

test_request_flags(hor, 0);

@@ -1092,10 +1076,8 @@ static void InternetReadFileExA_test(int flags)
     trace("Starting InternetReadFileExA test with flags 0x%x\n",flags);
     reset_events();

-    trace("InternetOpenA <--\n");
     hi = InternetOpenA("", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, flags);
     ok((hi != 0x0),"InternetOpen failed with error %u\n", GetLastError());
-    trace("InternetOpenA -->\n");

if (hi == 0x0) goto abort;

@@ -1103,18 +1085,15 @@ static void InternetReadFileExA_test(int flags)

SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED);

-    trace("InternetConnectA <--\n");
     hic=InternetConnectA(hi, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER,
                          NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef);
     ok((hic != 0x0),"InternetConnect failed with error %u\n", GetLastError());
-    trace("InternetConnectA -->\n");

if (hic == 0x0) goto abort;

CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED);
     SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED);

-    trace("HttpOpenRequestA <--\n");
     hor = HttpOpenRequestA(hic, "GET", "/tests/redirect", NULL, NULL, types,
                            INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RELOAD,
                            0xdeadbead);
@@ -1128,7 +1107,6 @@ static void InternetReadFileExA_test(int flags)
     } else  {
         ok((hor != 0x0),"HttpOpenRequest failed with error %u\n", GetLastError());
     }
-    trace("HttpOpenRequestA -->\n");

if (hor == 0x0) goto abort;

@@ -1157,7 +1135,6 @@ static void InternetReadFileExA_test(int flags)
     else
         SET_WINE_ALLOW(INTERNET_STATUS_REQUEST_COMPLETE);

-    trace("HttpSendRequestA -->\n");
     SetLastError(0xdeadbeef);
     rc = HttpSendRequestA(hor, "", -1, NULL, 0);
     if (flags & INTERNET_FLAG_ASYNC)
@@ -1166,7 +1143,6 @@ static void InternetReadFileExA_test(int flags)
     else
         ok((rc != 0) || GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED,
            "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError());
-    trace("HttpSendRequestA <--\n");

if (!rc && (GetLastError() == ERROR_IO_PENDING)) {
         WaitForSingleObject(complete_event, INFINITE);

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=97290

Your paranoid android.

=== w8adm (32 bit report) ===

wininet:
http.c:697: Test failed: req_error = 12007
http.c:708: Test failed: expected status 11 (INTERNET_STATUS_NAME_RESOLVED) 1 times, received 0 times
http.c:721: Test failed: expected status 30 (INTERNET_STATUS_SENDING_REQUEST) 1 times, received 0 times
http.c:722: Test failed: expected status 31 (INTERNET_STATUS_REQUEST_SENT) 1 times, received 0 times
http.c:723: Test failed: expected status 40 (INTERNET_STATUS_RECEIVING_RESPONSE) 1 times, received 0 times
http.c:724: Test failed: expected status 41 (INTERNET_STATUS_RESPONSE_RECEIVED) 1 times, received 0 times
http.c:733: Test failed: flags = 8, expected 0
http.c:747: Test failed: Expected any header character, got 0x00
http.c:774: Test failed: Expected 0x0000, got 7777
http.c:937: Test failed: Returned zero size in response to request complete
http.c:376: Test failed: unexpected status 10 (INTERNET_STATUS_RESOLVING_NAME)
http.c:697: Test failed: req_error = 12007
http.c:718: Test failed: expected status 10 (INTERNET_STATUS_RESOLVING_NAME) 0 times, received 1 times
http.c:721: Test failed: expected status 30 (INTERNET_STATUS_SENDING_REQUEST) 2 times, received 0 times
http.c:722: Test failed: expected status 31 (INTERNET_STATUS_REQUEST_SENT) 2 times, received 0 times
http.c:723: Test failed: expected status 40 (INTERNET_STATUS_RECEIVING_RESPONSE) 2 times, received 0 times
http.c:724: Test failed: expected status 41 (INTERNET_STATUS_RESPONSE_RECEIVED) 2 times, received 0 times
http.c:726: Test failed: expected status 110 (INTERNET_STATUS_REDIRECT) 1 times, received 0 times
http.c:733: Test failed: flags = 8, expected 0
http.c:747: Test failed: Expected any header character, got 0x00
http.c:774: Test failed: Expected 0x0000, got 7777
http.c:797: Test failed: size = 37
http.c:797: Test failed: unexpected URL http://test.winehq.org/tests/redirect, expected http://test.winehq.org/tests/hello.html
http.c:937: Test failed: Returned zero size in response to request complete
http.c:376: Test failed: unexpected status 10 (INTERNET_STATUS_RESOLVING_NAME)
http.c:376: Test failed: unexpected status 11 (INTERNET_STATUS_NAME_RESOLVED)
http.c:718: Test failed: expected status 10 (INTERNET_STATUS_RESOLVING_NAME) 0 times, received 1 times
http.c:719: Test failed: expected status 11 (INTERNET_STATUS_NAME_RESOLVED) 0 times, received 1 times