Skip to content

Commit 6f9106e

Browse files
sunny868DamonFool
authored andcommitted
8301306: java/net/httpclient/* fail with -Xcomp
Reviewed-by: dfuchs, alanb
1 parent ac9e046 commit 6f9106e

7 files changed

+12
-10
lines changed

test/jdk/java/net/httpclient/AbstractThrowingPushPromises.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ public void teardown() throws Exception {
728728
sharedClient == null ? null : sharedClient.toString();
729729
sharedClient = null;
730730
Thread.sleep(100);
731-
AssertionError fail = TRACKER.check(500);
731+
AssertionError fail = TRACKER.check(5000);
732732
try {
733733
http2TestServer.stop();
734734
https2TestServer.stop();

test/jdk/java/net/httpclient/ByteArrayPublishers.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* @test
2626
* @bug 8222968
2727
* @summary ByteArrayPublisher is not thread-safe resulting in broken re-use of HttpRequests
28-
* @run main/othervm ByteArrayPublishers
28+
* @run main/othervm -Dsun.net.httpserver.idleInterval=50000 ByteArrayPublishers
2929
*/
3030

3131
import java.net.InetAddress;

test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,13 @@
6363
* @run testng/othervm
6464
* -Djdk.httpclient.HttpClient.log=frames,ssl,requests,responses,errors
6565
* -Djdk.internal.httpclient.debug=true
66+
* -Dsun.net.httpserver.idleInterval=50000
6667
* HttpClientLocalAddrTest
6768
*
6869
* @run testng/othervm/java.security.policy=httpclient-localaddr-security.policy
6970
* -Djdk.httpclient.HttpClient.log=frames,ssl,requests,responses,errors
7071
* -Djdk.internal.httpclient.debug=true
72+
* -Dsun.net.httpserver.idleInterval=50000
7173
* HttpClientLocalAddrTest
7274
*
7375
*/

test/jdk/java/net/httpclient/ManyRequestsLegacy.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -31,10 +31,10 @@
3131
* @compile ../../../com/sun/net/httpserver/LogFilter.java
3232
* @compile ../../../com/sun/net/httpserver/EchoHandler.java
3333
* @compile ../../../com/sun/net/httpserver/FileServerHandler.java
34-
* @run main/othervm/timeout=40 ManyRequestsLegacy
35-
* @run main/othervm/timeout=40 -Dtest.insertDelay=true ManyRequestsLegacy
36-
* @run main/othervm/timeout=40 -Dtest.chunkSize=64 ManyRequestsLegacy
37-
* @run main/othervm/timeout=40 -Dtest.insertDelay=true
34+
* @run main/othervm/timeout=80 -Dsun.net.httpserver.idleInterval=50000 ManyRequestsLegacy
35+
* @run main/othervm/timeout=80 -Dtest.insertDelay=true -Dsun.net.httpserver.idleInterval=50000 ManyRequestsLegacy
36+
* @run main/othervm/timeout=80 -Dtest.chunkSize=64 -Dsun.net.httpserver.idleInterval=50000 ManyRequestsLegacy
37+
* @run main/othervm/timeout=80 -Dtest.insertDelay=true -Dsun.net.httpserver.idleInterval=50000
3838
* -Dtest.chunkSize=64 ManyRequestsLegacy
3939
* @summary Send a large number of requests asynchronously using the legacy
4040
* URL.openConnection(), to help sanitize results of the test

test/jdk/java/net/httpclient/Response204V2Test.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ public void teardown() throws Exception {
289289
sharedClient == null ? null : sharedClient.toString();
290290
sharedClient = null;
291291
Thread.sleep(100);
292-
AssertionError fail = TRACKER.check(500);
292+
AssertionError fail = TRACKER.check(5000);
293293
try {
294294
http2TestServer.stop();
295295
https2TestServer.stop();

test/jdk/java/net/httpclient/SpecialHeadersTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
* @build jdk.httpclient.test.lib.common.HttpServerAdapters
3131
* jdk.httpclient.test.lib.http2.Http2TestServer
3232
* jdk.test.lib.net.SimpleSSLContext
33+
* @requests (vm.compMode != "Xcomp")
3334
* @run testng/othervm
3435
* -Djdk.httpclient.HttpClient.log=requests,headers,errors
3536
* SpecialHeadersTest

test/jdk/java/net/vthread/HttpALot.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
3535
* @run main/othervm/timeout=600
3636
* -Dsun.net.httpserver.nodelay=true
3737
* -Dsun.net.client.defaultConnectTimeout=5000
38-
* -Dsun.net.client.defaultReadTimeout=5000
3938
* HttpALot
4039
*/
4140

0 commit comments

Comments
 (0)