Changing the waiting strategy on some IT tests (#24022)

* change waiting strategy

* remove unused imports

* remove test that did not exist in 6.2

* Revert "remove test that did not exist in 6.2"

This reverts commit 936eb93.

Author: janheise

full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/DatanodeOpensearchProxyIT.java

@@ -16,7 +16,6 @@
  */
 package org.graylog.searchbackend.datanode;
 
-import com.github.rholder.retry.RetryException;
 import io.restassured.response.ValidatableResponse;
 import org.assertj.core.api.Assertions;
 import org.graylog.testing.completebackend.Lifecycle;
@@ -31,7 +30,6 @@
 
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.ExecutionException;
 
 import static java.time.Duration.ofSeconds;
 import static org.awaitility.Awaitility.waitAtMost;
@@ -50,19 +48,24 @@ void setUp(GraylogApis apis) {
     }
 
     @FullBackendTest
-    void testProxyPlaintextGet() throws ExecutionException, RetryException {
-        waitAtMost(ofSeconds(30)).untilAsserted(() -> {
+    void testProxyPlaintextGet() {
+        waitAtMost(ofSeconds(30)).until(() -> {
             final ValidatableResponse response = apis.get("/datanodes/any/opensearch/_cat/indices", 200);
             final String responseBody = response.extract().body().asString();
-            Assertions.assertThat(responseBody).contains("graylog_0").contains("gl-system-events_0");
+            return responseBody.contains("graylog_0") && responseBody.contains("gl-system-events_0");
         });
     }
 
     @FullBackendTest
     void testProxyJsonGet() {
-        waitAtMost(ofSeconds(30)).untilAsserted(() -> {
-            final ValidatableResponse response = apis.get("/datanodes/any/opensearch/_mapping", 200);
-            response.assertThat().body("graylog_0.mappings.properties.gl2_accounted_message_size.type", Matchers.equalTo("long"));
+        waitAtMost(ofSeconds(30)).until(() -> {
+            try {
+                final ValidatableResponse response = apis.get("/datanodes/any/opensearch/_mapping", 200);
+                response.assertThat().body("graylog_0.mappings.properties.gl2_accounted_message_size.type", Matchers.equalTo("long"));
+            } catch (AssertionError e) {
+                return false;
+            }
+            return true;
         });
     }