From: Stefan Eissing <stefan@eissing.org>
Date: Thu, 8 Aug 2024 11:29:12 +0000 (+0200)
Subject: test677: improve robustness
X-Git-Tag: curl-8_10_0~317
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f27ba323ad19ab200f9fd74d7970a184f29d18fa;p=thirdparty%2Fcurl.git

test677: improve robustness

Do not treat CURLE_AGAIN as error.

Fixes test with CURL_DBG_SOCK_WBLOCK=90 set.

Closes #14455
---

diff --git a/tests/libtest/lib677.c b/tests/libtest/lib677.c
index 68ac75c1c2..5864924fc7 100644
--- a/tests/libtest/lib677.c
+++ b/tests/libtest/lib677.c
@@ -75,7 +75,7 @@ CURLcode test(char *URL)
       curl_easy_getinfo(curl, CURLINFO_ACTIVESOCKET, &sock);
       waitfd.fd = sock;
     }
-    curl_multi_wait(mcurl, &waitfd, sock == CURL_SOCKET_BAD ? 0 : 1, 500,
+    curl_multi_wait(mcurl, &waitfd, sock == CURL_SOCKET_BAD ? 0 : 1, 50,
                     &mrun);
     if((sock != CURL_SOCKET_BAD) && (waitfd.revents & waitfd.events)) {
       size_t len = 0;
@@ -83,7 +83,10 @@ CURLcode test(char *URL)
       if(!state) {
         CURLcode ec;
         ec = curl_easy_send(curl, cmd + pos, sizeof(cmd) - 1 - pos, &len);
-        if(ec != CURLE_OK) {
+        if(ec == CURLE_AGAIN) {
+          continue;
+        }
+        else if(ec) {
           fprintf(stderr, "curl_easy_send() failed, with code %d (%s)\n",
                   (int)ec, curl_easy_strerror(ec));
           res = ec;
@@ -101,7 +104,10 @@ CURLcode test(char *URL)
       else if(pos < (ssize_t)sizeof(buf)) {
         CURLcode ec;
         ec = curl_easy_recv(curl, buf + pos, sizeof(buf) - pos, &len);
-        if(ec != CURLE_OK) {
+        if(ec == CURLE_AGAIN) {
+          continue;
+        }
+        else if(ec) {
           fprintf(stderr, "curl_easy_recv() failed, with code %d (%s)\n",
                   (int)ec, curl_easy_strerror(ec));
           res = ec;