From cbbf4d8ed20662d24091fc5b9f364d135ba117b1 Mon Sep 17 00:00:00 2001
From: Stefan Eissing <stefan@eissing.org>
Date: Thu, 26 Sep 2024 14:43:54 +0200
Subject: [PATCH] test504: fix handling on pending connect

Test expected a connect to a port no one is listening to immediately
fail. But Windows has its internal retry logic that may fail this.

As fix, multi_perform()/multi_wait() until transfer is done.

Closes #15054
---
 tests/libtest/lib504.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/libtest/lib504.c b/tests/libtest/lib504.c
index 984ce27984..a9f96c8dde 100644
--- a/tests/libtest/lib504.c
+++ b/tests/libtest/lib504.c
@@ -72,6 +72,21 @@ CURLcode test(char *URL)
 
     multi_perform(m, &running);
 
+    while(running) {
+      CURLMcode mres;
+      int num;
+      mres = curl_multi_wait(m, NULL, 0, TEST_HANG_TIMEOUT, &num);
+      if(mres != CURLM_OK) {
+        printf("curl_multi_wait() returned %d\n", mres);
+        res = TEST_ERR_MAJOR_BAD;
+        goto test_cleanup;
+      }
+
+      abort_on_test_timeout();
+      multi_perform(m, &running);
+      abort_on_test_timeout();
+    }
+
     abort_on_test_timeout();
 
     if(!running) {