[URLMON_WINETEST] Skip test_ftp_protocol() because of timeouts. ROSTESTS-165

[reactos.git] / rostests / winetests / urlmon / protocol.c

diff --git a/rostests/winetests/urlmon/protocol.c b/rostests/winetests/urlmon/protocol.c
index 30fa046..efe216c 100644 (file)
--- a/rostests/winetests/urlmon/protocol.c
+++ b/rostests/winetests/urlmon/protocol.c
@@ -1996,7 +1996,9 @@ static HRESULT WINAPI ProtocolEmul_Read(IInternetProtocolEx *iface, void *pv,
             memcpy(pv, "gif87a", 6);
         prot_read += *pcbRead = cb;
         return S_OK;
-    }if(prot_state == 4) {
+    }
+
+    if(prot_state == 4) {
         *pcbRead = 0;
         return S_FALSE;
     }
@@ -2930,7 +2932,7 @@ static void test_protocol_terminate(IInternetProtocol *protocol)
     ok(hres == S_OK, "LockRequest failed: %08x\n", hres);
 
     hres = IInternetProtocol_Read(protocol, buf, 1, &cb);
-    ok(hres == test_abort ? S_OK : S_FALSE, "Read failed: %08x\n", hres);
+    ok(hres == (test_abort ? S_OK : S_FALSE), "Read failed: %08x\n", hres);
 
     hres = IInternetProtocol_Terminate(protocol, 0);
     ok(hres == S_OK, "Terminate failed: %08x\n", hres);
@@ -3748,12 +3750,6 @@ START_TEST(protocol)
 {
     HMODULE hurlmon;
 
-    if(!winetest_interactive)
-    {
-        skip("protocol test skipped, ROSTESTS-38\n");
-        return;
-    }
-
     hurlmon = GetModuleHandleA("urlmon.dll");
     pCoInternetGetSession = (void*) GetProcAddress(hurlmon, "CoInternetGetSession");
     pReleaseBindInfo = (void*) GetProcAddress(hurlmon, "ReleaseBindInfo");
@@ -3776,12 +3772,27 @@ START_TEST(protocol)
     thread_id = GetCurrentThreadId();
 
     test_file_protocol();
-    test_http_protocol();
+
+    if (!winetest_interactive)
+        skip("ROSTESTS-165: Skipping test_http_protocol() because of timeouts.\n");
+    else
+        test_http_protocol();
+
     if(pCreateUri)
-        test_https_protocol();
+    {
+        if (!winetest_interactive)
+            skip("ROSTESTS-165: Skipping test_https_protocol() because of timeouts.\n");
+        else
+            test_https_protocol();
+    }
     else
         win_skip("Skipping https tests on too old platform\n");
-    test_ftp_protocol();
+
+    if (!winetest_interactive)
+        skip("ROSTESTS-165: Skipping test_ftp_protocol() because of timeouts.\n");
+    else
+        test_ftp_protocol();
+
     test_gopher_protocol();
     test_mk_protocol();
     test_CreateBinding();