infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8373227: Test java/net/httpclient/http2/StreamFlowControlTest.java failed: should sleep time be raised?

Browse Source 
Reviewed-by: djelinski
This commit is contained in:
Daniel Fuchs 2025-12-10 12:08:53 +00:00
parent 8eaeb6990b
commit b58e3b600b
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/jdk/java/net/httpclient/http2/StreamFlowControlTest.java
View File

@ -82,6 +82,9 @@ public class StreamFlowControlTest {
String http2URI;
String https2URI;
final AtomicInteger reqid = new AtomicInteger();
final static int WINDOW =
Integer.getInteger("jdk.httpclient.windowsize", 2 * 16 * 1024);
@DataProvider(name = "variants")
@ -147,7 +150,11 @@ public class StreamFlowControlTest {
// the window is exceeded...
long wait = uri.startsWith("https://") ? 800 : 500;
try (InputStream is = response.body()) {
sleep(wait);
byte[] discard = new byte[WINDOW/4];
for (int j=0; j<2; j++) {
sleep(wait);
if (is.read(discard) < 0) break;
}
is.readAllBytes();
}
// we could fail here if we haven't waited long enough
@ -205,7 +212,11 @@ public class StreamFlowControlTest {
sent.join();
long wait = uri.startsWith("https://") ? 800 : 350;
try (InputStream is = response.body()) {
sleep(wait);
byte[] discard = new byte[WINDOW/4];
for (int j=0; j<2; j++) {
sleep(wait);
if (is.read(discard) < 0) break;
}
is.readAllBytes();
}
// we could fail here if we haven't waited long enough
@ -316,17 +327,16 @@ public class StreamFlowControlTest {
bytes = "no request body!"
.repeat(100).getBytes(StandardCharsets.UTF_8);
}
int window = Integer.getInteger("jdk.httpclient.windowsize", 2 * 16 * 1024);
final int maxChunkSize;
if (t instanceof FCHttp2TestExchange fct) {
maxChunkSize = Math.min(window, fct.conn.getMaxFrameSize());
maxChunkSize = Math.min(WINDOW, fct.conn.getMaxFrameSize());
} else {
maxChunkSize = Math.min(window, SettingsFrame.MAX_FRAME_SIZE);
maxChunkSize = Math.min(WINDOW, SettingsFrame.MAX_FRAME_SIZE);
}
byte[] resp = bytes.length <= maxChunkSize
? bytes
: Arrays.copyOfRange(bytes, 0, maxChunkSize);
int max = (window / resp.length) + 2;
int max = (WINDOW / resp.length) + 2;
// send in chunks
t.sendResponseHeaders(200, 0);
for (int i = 0; i <= max; i++) {