From 7091e06a51b66535e21d49431c0f049fba314f02 Mon Sep 17 00:00:00 2001
From: duke <duke@openjdk.org>
Date: Wed, 15 Oct 2025 08:36:32 +0000
Subject: [PATCH] Backport e15d2419ab9c812a3dc18812406f7b59976d2143

---
 test/jdk/java/net/httpclient/CancelRequestTest.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/test/jdk/java/net/httpclient/CancelRequestTest.java b/test/jdk/java/net/httpclient/CancelRequestTest.java
index f393d437e28..aaec8d52f7b 100644
--- a/test/jdk/java/net/httpclient/CancelRequestTest.java
+++ b/test/jdk/java/net/httpclient/CancelRequestTest.java
@@ -38,6 +38,7 @@
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
+import jdk.internal.net.http.common.OperationTrackers.Tracker;
 import jdk.test.lib.RandomFactory;
 import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.ITestContext;
@@ -305,6 +306,7 @@ public void testGetSendAsync(String uri, boolean sameClient, boolean mayInterrup
         for (int i=0; i< ITERATION_COUNT; i++) {
             if (!sameClient || client == null)
                 client = newHttpClient(sameClient);
+            Tracker tracker = TRACKER.getTracker(client);
 
             HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
                     .GET()
@@ -379,7 +381,7 @@ public void testGetSendAsync(String uri, boolean sameClient, boolean mayInterrup
             assertEquals(cf2.isCancelled(), false);
             assertEquals(latch.getCount(), 0);
 
-            var error = TRACKER.check(1,
+            var error = TRACKER.check(tracker, 200,
                     (t) -> t.getOutstandingOperations() > 0 || t.getOutstandingSubscribers() > 0,
                     "subscribers for testGetSendAsync(%s)\n\t step [%s]".formatted(req.uri(), i),
                     false);
@@ -398,6 +400,7 @@ public void testPostSendAsync(String uri, boolean sameClient, boolean mayInterru
         for (int i=0; i< ITERATION_COUNT; i++) {
             if (!sameClient || client == null)
                 client = newHttpClient(sameClient);
+            Tracker tracker = TRACKER.getTracker(client);
 
             CompletableFuture<CompletableFuture<?>> cancelFuture = new CompletableFuture<>();
 
@@ -490,7 +493,7 @@ public Iterator<byte[]> iterator() {
             assertEquals(cf2.isCancelled(), false);
             assertEquals(latch.getCount(), 0);
 
-            var error = TRACKER.check(1,
+            var error = TRACKER.check(tracker, 200,
                     (t) -> t.getOutstandingOperations() > 0 || t.getOutstandingSubscribers() > 0,
                     "subscribers for testPostSendAsync(%s)\n\t step [%s]".formatted(req.uri(), i),
                     false);
@@ -508,6 +511,8 @@ public void testPostInterrupt(String uri, boolean sameClient)
         for (int i=0; i< ITERATION_COUNT; i++) {
             if (!sameClient || client == null)
                 client = newHttpClient(sameClient);
+            Tracker tracker = TRACKER.getTracker(client);
+
             Thread main = Thread.currentThread();
             CompletableFuture<Thread> interruptingThread = new CompletableFuture<>();
             Runnable interrupt = () -> {
@@ -552,7 +557,7 @@ public void testPostInterrupt(String uri, boolean sameClient)
                 throw failed;
             }
 
-            var error = TRACKER.check(1,
+            var error = TRACKER.check(tracker, 200,
                     (t) -> t.getOutstandingOperations() > 0 || t.getOutstandingSubscribers() > 0,
                     "subscribers for testPostInterrupt(%s)\n\t step [%s]".formatted(req.uri(), i),
                     false);