Increase assertAllCancellableTasksAreCancelled timeout (#89744) (#89751)

Failed cherry-pick of #89744
elastic · Aug 31, 2022 · 5270bc5 · 5270bc5
1 parent 045b7b2
commit 5270bc5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...ttp/src/javaRestTest/java/org/elasticsearch/http/RestClusterInfoActionCancellationIT.java b/...ttp/src/javaRestTest/java/org/elasticsearch/http/RestClusterInfoActionCancellationIT.java
@@ -26,6 +26,7 @@
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.test.ESIntegTestCase;
+import org.elasticsearch.test.junit.annotations.TestLogging;
 
 import java.util.EnumSet;
 import java.util.concurrent.CancellationException;
@@ -38,6 +39,7 @@
 import static org.hamcrest.core.IsEqual.equalTo;
 
 @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, numClientNodes = 0)
+@TestLogging(value = "org.elasticsearch.tasks.TaskManager:TRACE,org.elasticsearch.test.TaskAssertions:TRACE", reason = "debugging")
 public class RestClusterInfoActionCancellationIT extends HttpSmokeTestCase {
 
     public void testGetMappingsCancellation() throws Exception {

diff --git a/test/framework/src/main/java/org/elasticsearch/test/TaskAssertions.java b/test/framework/src/main/java/org/elasticsearch/test/TaskAssertions.java
@@ -16,6 +16,7 @@
 import org.elasticsearch.transport.TransportService;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
@@ -60,7 +61,7 @@ public static void assertAllCancellableTasksAreCancelled(String actionPrefix) th
                 }
             }
             assertTrue("found no cancellable tasks", foundTask);
-        });
+        }, 30, TimeUnit.SECONDS);
     }
 
     public static void assertAllTasksHaveFinished(String actionPrefix) throws Exception {