From 08e004010ce928a08e656b1a79949a6240dade69 Mon Sep 17 00:00:00 2001 From: csviri Date: Thu, 23 Feb 2023 09:47:25 +0100 Subject: [PATCH 1/2] fix: IT timeout for garbage collection --- .../io/javaoperatorsdk/operator/ClusterScopedResourceIT.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/ClusterScopedResourceIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ClusterScopedResourceIT.java index f1c15f2dec..503dbfaa05 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/ClusterScopedResourceIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ClusterScopedResourceIT.java @@ -10,6 +10,8 @@ import io.javaoperatorsdk.operator.sample.clusterscopedresource.ClusterScopedCustomResourceReconciler; import io.javaoperatorsdk.operator.sample.clusterscopedresource.ClusterScopedCustomResourceSpec; +import java.time.Duration; + import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -47,7 +49,7 @@ void crudOperationOnClusterScopedCustomResource() { }); operator.delete(resource); - await().untilAsserted(() -> assertThat(operator.get(ConfigMap.class, TEST_NAME)).isNull()); + await().atMost(Duration.ofSeconds(30)).untilAsserted(() -> assertThat(operator.get(ConfigMap.class, TEST_NAME)).isNull()); } From 878a96e1ef99501d8d42f6ae68de8d325bac86fb Mon Sep 17 00:00:00 2001 From: csviri Date: Thu, 23 Feb 2023 10:01:21 +0100 Subject: [PATCH 2/2] format --- .../javaoperatorsdk/operator/ClusterScopedResourceIT.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/ClusterScopedResourceIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ClusterScopedResourceIT.java index 503dbfaa05..b1a3797bea 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/ClusterScopedResourceIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ClusterScopedResourceIT.java @@ -1,5 +1,7 @@ package io.javaoperatorsdk.operator; +import java.time.Duration; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -10,8 +12,6 @@ import io.javaoperatorsdk.operator.sample.clusterscopedresource.ClusterScopedCustomResourceReconciler; import io.javaoperatorsdk.operator.sample.clusterscopedresource.ClusterScopedCustomResourceSpec; -import java.time.Duration; - import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -49,7 +49,8 @@ void crudOperationOnClusterScopedCustomResource() { }); operator.delete(resource); - await().atMost(Duration.ofSeconds(30)).untilAsserted(() -> assertThat(operator.get(ConfigMap.class, TEST_NAME)).isNull()); + await().atMost(Duration.ofSeconds(30)) + .untilAsserted(() -> assertThat(operator.get(ConfigMap.class, TEST_NAME)).isNull()); }