Skip to content

Commit be72703

Browse files
committed
8301306: java/net/httpclient/* fail with -Xcomp
8301787: java/net/httpclient/SpecialHeadersTest failing after JDK-8301306 Reviewed-by: lucy Backport-of: 6f9106e0d0d9f082f0a61009f95d1b8663dd8d4f
1 parent f8f733d commit be72703

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ public void teardown() throws Exception {
729729
sharedClient == null ? null : sharedClient.toString();
730730
sharedClient = null;
731731
Thread.sleep(100);
732-
AssertionError fail = TRACKER.check(500);
732+
AssertionError fail = TRACKER.check(5000);
733733
try {
734734
http2TestServer.stop();
735735
https2TestServer.stop();

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

Lines changed: 1 addition & 1 deletion
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/ManyRequestsLegacy.java

Lines changed: 5 additions & 5 deletions
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ public void teardown() throws Exception {
291291
sharedClient == null ? null : sharedClient.toString();
292292
sharedClient = null;
293293
Thread.sleep(100);
294-
AssertionError fail = TRACKER.check(500);
294+
AssertionError fail = TRACKER.check(5000);
295295
try {
296296
http2TestServer.stop();
297297
https2TestServer.stop();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
* @library /test/lib http2/server
3636
* @build Http2TestServer HttpServerAdapters SpecialHeadersTest
3737
* @build jdk.test.lib.net.SimpleSSLContext
38+
* @requires (vm.compMode != "Xcomp")
3839
* @run testng/othervm
3940
* -Djdk.httpclient.HttpClient.log=requests,headers,errors
4041
* SpecialHeadersTest

0 commit comments

Comments
 (0)