Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions test/jdk/java/net/httpclient/http3/GetHTTP3Test.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import java.net.http.HttpResponse;
import java.net.http.HttpResponse.BodyHandlers;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand All @@ -47,6 +46,7 @@
import java.util.concurrent.atomic.AtomicLong;
import javax.net.ssl.SSLContext;

import jdk.test.lib.Utils;
import jdk.test.lib.net.SimpleSSLContext;
import jdk.httpclient.test.lib.common.HttpServerAdapters;
import jdk.httpclient.test.lib.http2.Http2TestServer;
Expand Down Expand Up @@ -74,8 +74,9 @@
* @library /test/lib /test/jdk/java/net/httpclient/lib
* @build jdk.test.lib.net.SimpleSSLContext
* jdk.httpclient.test.lib.common.HttpServerAdapters
* jdk.test.lib.Utils
* @compile ../ReferenceTracker.java
* @run testng/othervm/timeout=60 -Djdk.internal.httpclient.debug=true
* @run testng/othervm -Djdk.internal.httpclient.debug=true
* -Djdk.httpclient.HttpClient.log=requests,responses,errors
* GetHTTP3Test
* @summary Basic HTTP/3 GET test
Expand Down Expand Up @@ -216,7 +217,6 @@ private HttpClient makeNewClient() {
.proxy(HttpClient.Builder.NO_PROXY)
.executor(executor)
.sslContext(sslContext)
.connectTimeout(Duration.ofSeconds(10))
.build();
return TRACKER.track(client);
}
Expand Down Expand Up @@ -348,7 +348,7 @@ public void testAsync(String uri, Version firstRequestVersion, boolean sameClien
var tracker = TRACKER.getTracker(client);
client = null;
System.gc();
AssertionError error = TRACKER.check(tracker, 1000);
AssertionError error = TRACKER.check(tracker, Utils.adjustTimeout(1000));
if (error != null) throw error;
}
System.out.println("test: DONE");
Expand Down Expand Up @@ -394,7 +394,7 @@ public void testSync(String h3URI) throws Exception {
var tracker = TRACKER.getTracker(client);
client = null;
System.gc();
AssertionError error = TRACKER.check(tracker, 1000);
AssertionError error = TRACKER.check(tracker, Utils.adjustTimeout(1000));
if (error != null) throw error;
}

Expand Down Expand Up @@ -423,7 +423,7 @@ public void teardown() throws Exception {
sharedClient == null ? null : sharedClient.toString();
sharedClient = null;
Thread.sleep(100);
AssertionError fail = TRACKER.check(500);
AssertionError fail = TRACKER.check(Utils.adjustTimeout(1000));
try {
h3TestServer.stop();
} finally {
Expand Down
10 changes: 5 additions & 5 deletions test/jdk/java/net/httpclient/http3/PostHTTP3Test.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import java.net.http.HttpResponse;
import java.net.http.HttpResponse.BodyHandlers;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand All @@ -53,6 +52,7 @@
import java.util.stream.Stream;
import javax.net.ssl.SSLContext;

import jdk.test.lib.Utils;
import jdk.test.lib.net.SimpleSSLContext;
import jdk.httpclient.test.lib.common.HttpServerAdapters;
import jdk.httpclient.test.lib.http2.Http2TestServer;
Expand All @@ -79,6 +79,7 @@
* @library /test/lib /test/jdk/java/net/httpclient/lib
* @build jdk.test.lib.net.SimpleSSLContext
* jdk.httpclient.test.lib.common.HttpServerAdapters
* jdk.test.lib.Utils
* @compile ../ReferenceTracker.java
* @run testng/othervm -Djdk.internal.httpclient.debug=true
* -Djdk.httpclient.HttpClient.log=requests,responses,errors
Expand Down Expand Up @@ -221,7 +222,6 @@ private HttpClient makeNewClient() {
.proxy(HttpClient.Builder.NO_PROXY)
.executor(executor)
.sslContext(sslContext)
.connectTimeout(Duration.ofSeconds(10))
.build();
return TRACKER.track(client);
}
Expand Down Expand Up @@ -375,7 +375,7 @@ public void testAsync(String uri, Version firstRequestVersion, boolean sameClien
var tracker = TRACKER.getTracker(client);
client = null;
System.gc();
AssertionError error = TRACKER.check(tracker, 1000);
AssertionError error = TRACKER.check(tracker, Utils.adjustTimeout(1000));
if (error != null) throw error;
}
System.out.println("test: DONE");
Expand Down Expand Up @@ -437,7 +437,7 @@ public void testSync(String h3URI) throws Exception {
var tracker = TRACKER.getTracker(client);
client = null;
System.gc();
AssertionError error = TRACKER.check(tracker, 1000);
AssertionError error = TRACKER.check(tracker, Utils.adjustTimeout(1000));
if (error != null) throw error;
}

Expand Down Expand Up @@ -466,7 +466,7 @@ public void teardown() throws Exception {
sharedClient == null ? null : sharedClient.toString();
sharedClient = null;
Thread.sleep(100);
AssertionError fail = TRACKER.check(500);
AssertionError fail = TRACKER.check(Utils.adjustTimeout(1000));
try {
h3TestServer.stop();
} finally {
Expand Down