Http client connection issue (#356)

* Troubleshooting occasional connection issues

* Troubleshooting occasional connection issues

* Changed nginx container wait strategy

Author: msupic

tests/src/org.apache.httpcomponents/httpclient/4.5.14/.gitignore

@@ -2,5 +2,3 @@ gradlew.bat
 gradlew
 gradle/
 build/
-nginx-stderr.txt
-nginx-stdout.txt

tests/src/org.apache.httpcomponents/httpclient/4.5.14/build.gradle

@@ -15,3 +15,11 @@ dependencies {
     testImplementation "org.apache.httpcomponents:httpclient:$libraryVersion"
     testImplementation 'org.assertj:assertj-core:3.22.0'
 }
+
+graalvmNative {
+    binaries {
+        test {
+            buildArgs.add('--enable-url-protocols=http')
+        }
+    }
+}

tests/src/org.apache.httpcomponents/httpclient/4.5.14/src/test/java/org_apache_httpcomponents/httpclient/HttpClientTest.java

@@ -19,19 +19,20 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import java.io.File;
 import java.io.IOException;
-import java.net.InetSocketAddress;
+import java.net.HttpURLConnection;
 import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketTimeoutException;
+import java.net.URL;
+import java.util.concurrent.Callable;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 class HttpClientTest {
 
     private static int port;
 
+    private static String uri;
+
     private static Process process;
 
     @BeforeAll
@@ -40,15 +41,16 @@ static void beforeAll() throws IOException {
         port = findAvailablePort();
         System.out.println("Found port: " + port);
 
+        uri = "http://localhost:%d/".formatted(port);
+
         System.out.println("Starting nginx ...");
         process = new ProcessBuilder(
                 "docker", "run", "--rm", "-p", port + ":80", "nginx:1-alpine-slim")
-                .redirectOutput(new File("nginx-stdout.txt"))
-                .redirectError(new File("nginx-stderr.txt"))
+                .inheritIO()
                 .start();
 
         // Wait until connection can be established
-        waitUntilContainerStarted(60);
+        waitUntil(() -> openConnection(uri), 60, 1);
 
         System.out.println("nginx started");
     }
@@ -62,42 +64,34 @@ private static int findAvailablePort() throws IOException {
         }
     }
 
-    private static void waitUntilContainerStarted(int startupTimeoutSeconds) {
-        System.out.println("Waiting for nginx container to become available");
+    private static boolean openConnection(String uri) throws Exception {
+        HttpURLConnection connection = (HttpURLConnection) new URL(uri).openConnection();
+        connection.setReadTimeout(1000);
+        connection.setRequestMethod("GET");
+        connection.connect();
+        return HttpURLConnection.HTTP_OK == connection.getResponseCode();
+    }
 
-        Exception lastConnectionException = null;
+    private static void waitUntil(Callable<Boolean> conditionEvaluator, int timeoutSeconds, int sleepTimeSeconds) {
+        Exception lastException = null;
 
-        long end = System.currentTimeMillis() + startupTimeoutSeconds * 1000L;
+        long end = System.currentTimeMillis() + timeoutSeconds * 1000L;
         while (System.currentTimeMillis() < end) {
             try {
-                Thread.sleep(100L);
+                Thread.sleep(sleepTimeSeconds * 1000L);
             } catch (InterruptedException e) {
                 // continue
             }
-            try (Socket socket = new Socket()) {
-                socket.setSoTimeout(100);
-                socket.connect(new InetSocketAddress("localhost", port), 100);
-                if (!check(socket)) {
-                    continue;
+            try {
+                if (conditionEvaluator.call()) {
+                    return;
                 }
-                return;
             } catch (Exception e) {
-                lastConnectionException = e;
-            }
-        }
-        throw new IllegalStateException("nginx container cannot be accessed on localhost:" + port, lastConnectionException);
-    }
-
-    private static boolean check(Socket socket) throws IOException {
-        try {
-            // -1 indicates the socket has been closed immediately
-            // Other responses or a timeout are considered as success
-            if (socket.getInputStream().read() == -1) {
-                return false;
+                lastException = e;
             }
-        } catch (SocketTimeoutException ex) {
         }
-        return true;
+        String errorMessage = "Condition was not fulfilled within " + timeoutSeconds + " seconds";
+        throw lastException == null ? new IllegalStateException(errorMessage) : new IllegalStateException(errorMessage, lastException);
     }
 
     @AfterAll
@@ -116,7 +110,7 @@ void testBasicSchemeDeserialization() throws Exception {
         HttpClientContext context = HttpClientContext.create();
         context.setAuthCache(authCache);
 
-        HttpGet httpGet = new HttpGet("http://localhost:%d/".formatted(port));
+        HttpGet httpGet = new HttpGet(uri);
         try (CloseableHttpClient httpclient = HttpClients.createDefault()) {
             try (CloseableHttpResponse response = httpclient.execute(httpGet, context)) {
                 assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);