stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8344346: java/net/httpclient/ShutdownNow.java fails with java.lang.AssertionError: client was still running, but exited after further delay: timeout should be adjusted

Browse Source 
Reviewed-by: jpai
This commit is contained in:
Daniel Fuchs 2024-11-22 09:55:07 +00:00
parent 2ea0364b6e
commit a07b72bfcf
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/jdk/java/net/httpclient/ShutdownNow.java
View File

@ -30,6 +30,7 @@
* isTerminated. * isTerminated.
* @library /test/lib /test/jdk/java/net/httpclient/lib * @library /test/lib /test/jdk/java/net/httpclient/lib
* @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
* jdk.test.lib.RandomFactory jdk.test.lib.Utils
* ReferenceTracker * ReferenceTracker
* @run testng/othervm * @run testng/othervm
* -Djdk.internal.httpclient.debug=true * -Djdk.internal.httpclient.debug=true
@ -41,8 +42,6 @@
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.URI; import java.net.URI;
import java.net.http.HttpClient; import java.net.http.HttpClient;
import java.net.http.HttpClient.Redirect; import java.net.http.HttpClient.Redirect;
@ -58,20 +57,12 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException; import java.util.concurrent.CompletionException;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
import jdk.httpclient.test.lib.common.HttpServerAdapters; import jdk.httpclient.test.lib.common.HttpServerAdapters;
import jdk.httpclient.test.lib.http2.Http2TestServer;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLHandshakeException;
import com.sun.net.httpserver.HttpServer;
import com.sun.net.httpserver.HttpsConfigurator;
import com.sun.net.httpserver.HttpsServer;
import jdk.test.lib.RandomFactory; import jdk.test.lib.RandomFactory;
import jdk.test.lib.Utils;
import jdk.test.lib.net.SimpleSSLContext; import jdk.test.lib.net.SimpleSSLContext;
import org.testng.annotations.AfterTest; import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeTest; import org.testng.annotations.BeforeTest;
@ -211,7 +202,7 @@ public class ShutdownNow implements HttpServerAdapters {
} }
CompletableFuture.allOf(responses.toArray(new CompletableFuture<?>[0])).get(); CompletableFuture.allOf(responses.toArray(new CompletableFuture<?>[0])).get();
} finally { } finally {
if (client.awaitTermination(Duration.ofMillis(2500))) { if (client.awaitTermination(Duration.ofMillis(Utils.adjustTimeout(1000)))) {
out.println("Client terminated within expected delay"); out.println("Client terminated within expected delay");
assertTrue(client.isTerminated()); assertTrue(client.isTerminated());
} else { } else {
@ -277,7 +268,7 @@ public class ShutdownNow implements HttpServerAdapters {
}).thenCompose((c) -> c).get(); }).thenCompose((c) -> c).get();
} }
} finally { } finally {
if (client.awaitTermination(Duration.ofMillis(2500))) { if (client.awaitTermination(Duration.ofMillis(Utils.adjustTimeout(1000)))) {
out.println("Client terminated within expected delay"); out.println("Client terminated within expected delay");
assertTrue(client.isTerminated()); assertTrue(client.isTerminated());
} else { } else {