Debug test failure/timeout (#1400)

Signed-off-by: Michael Edgar <[email protected]>
streamshub · Jan 24, 2025 · 0d50324 · 0d50324
1 parent 84d04bf
commit 0d50324
Showing 1 changed file with 30 additions and 17 deletions.
diff --git a/operator/src/test/java/com/github/streamshub/console/ConsoleReconcilerTestBase.java b/operator/src/test/java/com/github/streamshub/console/ConsoleReconcilerTestBase.java
@@ -1,6 +1,7 @@
 package com.github.streamshub.console;
 
 import java.time.Duration;
+import java.util.Arrays;
 import java.util.Base64;
 import java.util.List;
 import java.util.Map;
@@ -10,6 +11,7 @@
 
 import jakarta.inject.Inject;
 
+import org.awaitility.core.ConditionTimeoutException;
 import org.eclipse.microprofile.config.Config;
 import org.jboss.logging.Logger;
 import org.junit.jupiter.api.BeforeEach;
@@ -26,6 +28,7 @@
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KeyToPath;
+import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.api.model.NamespaceBuilder;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.api.model.Secret;
@@ -34,6 +37,8 @@
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
 import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.dsl.Deletable;
+import io.fabric8.kubernetes.client.dsl.Listable;
 import io.javaoperatorsdk.operator.Operator;
 import io.strimzi.api.kafka.Crds;
 import io.strimzi.api.kafka.model.kafka.Kafka;
@@ -77,6 +82,17 @@ public static <T extends HasMetadata> T apply(KubernetesClient client, T resourc
         return client.resource(resource).patchStatus();
     }
 
+    static void delete(Deletable... clients) {
+        Arrays.asList(clients).forEach(Deletable::delete);
+    }
+
+    @SafeVarargs
+    static List<?> allItems(Listable<? extends KubernetesResourceList<?>>... clients) {
+        return Arrays.stream(clients)
+            .flatMap(c -> c.list().getItems().stream())
+            .toList();
+    }
+
     @BeforeEach
     void setUp() {
         client.resource(Crds.kafka()).serverSideApply();
@@ -120,23 +136,20 @@ void setUp() {
         var allSecrets = client.resources(Secret.class).inAnyNamespace().withLabels(ConsoleResource.MANAGEMENT_LABEL);
         var allIngresses = client.resources(Ingress.class).inAnyNamespace().withLabels(ConsoleResource.MANAGEMENT_LABEL);
 
-        allConsoles.delete();
-        allKafkas.delete();
-        allKafkaUsers.delete();
-        allDeployments.delete();
-        allConfigMaps.delete();
-        allSecrets.delete();
-        allIngresses.delete();
-
-        await().atMost(Duration.ofSeconds(30)).untilAsserted(() -> {
-            assertTrue(allConsoles.list().getItems().isEmpty());
-            assertTrue(allKafkas.list().getItems().isEmpty());
-            assertTrue(allKafkaUsers.list().getItems().isEmpty());
-            assertTrue(allDeployments.list().getItems().isEmpty());
-            assertTrue(allConfigMaps.list().getItems().isEmpty());
-            assertTrue(allSecrets.list().getItems().isEmpty());
-            assertTrue(allIngresses.list().getItems().isEmpty());
-        });
+        delete(allConsoles, allKafkas, allKafkaUsers, allDeployments, allConfigMaps, allSecrets, allIngresses);
+
+        try {
+            await().atMost(Duration.ofSeconds(30)).until(() -> allItems(allConsoles, allKafkas, allKafkaUsers,
+                    allDeployments, allConfigMaps, allSecrets, allIngresses).isEmpty());
+        } catch (ConditionTimeoutException e) {
+            var remainingItems = allItems(allConsoles, allKafkas, allKafkaUsers,
+                    allDeployments, allConfigMaps, allSecrets, allIngresses);
+
+            if (!remainingItems.isEmpty()) {
+                LOGGER.warnf("Items were not deleted before timeout: %s", remainingItems);
+                throw e;
+            }
+        }
 
         operator.start();