Skip to content

Commit

Permalink
8301306: java/net/httpclient/* fail with -Xcomp
Browse files Browse the repository at this point in the history
8301787: java/net/httpclient/SpecialHeadersTest failing after JDK-8301306

Reviewed-by: lucy
Backport-of: 6f9106e0d0d9f082f0a61009f95d1b8663dd8d4f
  • Loading branch information
GoeLin committed Dec 6, 2023
1 parent f8f733d commit be72703
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,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(5000);
try {
http2TestServer.stop();
https2TestServer.stop();
Expand Down
2 changes: 1 addition & 1 deletion test/jdk/java/net/httpclient/ByteArrayPublishers.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* @test
* @bug 8222968
* @summary ByteArrayPublisher is not thread-safe resulting in broken re-use of HttpRequests
* @run main/othervm ByteArrayPublishers
* @run main/othervm -Dsun.net.httpserver.idleInterval=50000 ByteArrayPublishers
*/

import java.net.InetAddress;
Expand Down
10 changes: 5 additions & 5 deletions test/jdk/java/net/httpclient/ManyRequestsLegacy.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -31,10 +31,10 @@
* @compile ../../../com/sun/net/httpserver/LogFilter.java
* @compile ../../../com/sun/net/httpserver/EchoHandler.java
* @compile ../../../com/sun/net/httpserver/FileServerHandler.java
* @run main/othervm/timeout=40 ManyRequestsLegacy
* @run main/othervm/timeout=40 -Dtest.insertDelay=true ManyRequestsLegacy
* @run main/othervm/timeout=40 -Dtest.chunkSize=64 ManyRequestsLegacy
* @run main/othervm/timeout=40 -Dtest.insertDelay=true
* @run main/othervm/timeout=80 -Dsun.net.httpserver.idleInterval=50000 ManyRequestsLegacy
* @run main/othervm/timeout=80 -Dtest.insertDelay=true -Dsun.net.httpserver.idleInterval=50000 ManyRequestsLegacy
* @run main/othervm/timeout=80 -Dtest.chunkSize=64 -Dsun.net.httpserver.idleInterval=50000 ManyRequestsLegacy
* @run main/othervm/timeout=80 -Dtest.insertDelay=true -Dsun.net.httpserver.idleInterval=50000
* -Dtest.chunkSize=64 ManyRequestsLegacy
* @summary Send a large number of requests asynchronously using the legacy
* URL.openConnection(), to help sanitize results of the test
Expand Down
2 changes: 1 addition & 1 deletion test/jdk/java/net/httpclient/Response204V2Test.java
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,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(5000);
try {
http2TestServer.stop();
https2TestServer.stop();
Expand Down
1 change: 1 addition & 0 deletions test/jdk/java/net/httpclient/SpecialHeadersTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
* @library /test/lib http2/server
* @build Http2TestServer HttpServerAdapters SpecialHeadersTest
* @build jdk.test.lib.net.SimpleSSLContext
* @requires (vm.compMode != "Xcomp")
* @run testng/othervm
* -Djdk.httpclient.HttpClient.log=requests,headers,errors
* SpecialHeadersTest
Expand Down

1 comment on commit be72703

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.