Inline listener and TEST_REQUEST_TIMEOUT -- this isn't what TEST_REQUEST_TIMEOUT is for

DaveCTurner · DaveCTurner · commit 5d2ad879327c · 2025-08-07T09:34:03.000+01:00
diff --git a/test/framework/src/main/java/org/elasticsearch/test/ClusterServiceUtils.java b/test/framework/src/main/java/org/elasticsearch/test/ClusterServiceUtils.java
@@ -239,8 +239,7 @@ public static void setAllElapsedMillis(ClusterStatePublicationEvent clusterState
     }
 
     public static void awaitClusterState(Predicate<ClusterState> statePredicate, ClusterService clusterService) {
-        final var listener = addTemporaryStateListener(clusterService, statePredicate, ESTestCase.TEST_REQUEST_TIMEOUT);
-        ESTestCase.safeAwait(listener, ESTestCase.TEST_REQUEST_TIMEOUT);
+        ESTestCase.safeAwait(addTemporaryStateListener(clusterService, statePredicate, TimeValue.THIRTY_SECONDS), TimeValue.THIRTY_SECONDS);
     }
 
     public static void awaitNoPendingTasks(ClusterService clusterService) {

Original file line number	Diff line number	Diff line change
`@@ -239,8 +239,7 @@ public static void setAllElapsedMillis(ClusterStatePublicationEvent clusterState`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`public static void awaitClusterState(Predicate<ClusterState> statePredicate, ClusterService clusterService) {`
`242`		`- final var listener = addTemporaryStateListener(clusterService, statePredicate, ESTestCase.TEST_REQUEST_TIMEOUT);`
`243`		`- ESTestCase.safeAwait(listener, ESTestCase.TEST_REQUEST_TIMEOUT);`
	`242`	`+ ESTestCase.safeAwait(addTemporaryStateListener(clusterService, statePredicate, TimeValue.THIRTY_SECONDS), TimeValue.THIRTY_SECONDS);`
`244`	`243`	`}`
`245`	`244`
`246`	`245`	`public static void awaitNoPendingTasks(ClusterService clusterService) {`