From 551bf797987e9822785868be8def5278f4eecf48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Wed, 14 Jan 2026 14:23:13 +0100 Subject: [PATCH] improve: timouts for integration test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- .../javaoperatorsdk/operator/IntegrationTestConstants.java | 4 ++++ .../baseapi/expectation/onallevent/ExpectationIT.java | 3 +++ .../periodicclean/PeriodicCleanerExpectationIT.java | 3 +++ .../standalonedependent/StandaloneDependentResourceIT.java | 2 +- .../workflow/complexdependent/ComplexWorkflowIT.java | 2 +- .../workflow/workflowallfeature/WorkflowAllFeatureIT.java | 6 ++++-- 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestConstants.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestConstants.java index 5be26e1c93..96a8b9119a 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestConstants.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestConstants.java @@ -15,7 +15,11 @@ */ package io.javaoperatorsdk.operator; +import java.time.Duration; + public class IntegrationTestConstants { public static final int GARBAGE_COLLECTION_TIMEOUT_SECONDS = 60; + + public static final Duration GARBAGE_COLLECTION_TIMEOUT = Duration.ofSeconds(60); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/onallevent/ExpectationIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/onallevent/ExpectationIT.java index fee3b3c583..49666f15f2 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/onallevent/ExpectationIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/onallevent/ExpectationIT.java @@ -24,6 +24,7 @@ import io.javaoperatorsdk.annotation.Sample; import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension; +import static io.javaoperatorsdk.operator.IntegrationTestConstants.GARBAGE_COLLECTION_TIMEOUT; import static io.javaoperatorsdk.operator.baseapi.expectation.onallevent.ExpectationReconciler.DEPLOYMENT_READY; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -52,6 +53,7 @@ void testExpectation() { extension.create(res); await() + .timeout(GARBAGE_COLLECTION_TIMEOUT) .untilAsserted( () -> { var actual = extension.get(ExpectationCustomResource.class, TEST_1); @@ -67,6 +69,7 @@ void expectationTimeouts() { extension.create(res); await() + .timeout(GARBAGE_COLLECTION_TIMEOUT) .untilAsserted( () -> { var actual = extension.get(ExpectationCustomResource.class, TEST_1); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/periodicclean/PeriodicCleanerExpectationIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/periodicclean/PeriodicCleanerExpectationIT.java index fc31b8e2ec..bc41c4d82f 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/periodicclean/PeriodicCleanerExpectationIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/periodicclean/PeriodicCleanerExpectationIT.java @@ -24,6 +24,7 @@ import io.javaoperatorsdk.annotation.Sample; import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension; +import static io.javaoperatorsdk.operator.IntegrationTestConstants.GARBAGE_COLLECTION_TIMEOUT; import static io.javaoperatorsdk.operator.baseapi.expectation.periodicclean.PeriodicCleanerExpectationReconciler.DEPLOYMENT_READY; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -57,6 +58,7 @@ void testPeriodicCleanerExpectationBasicFlow() { extension.create(res); await() + .timeout(GARBAGE_COLLECTION_TIMEOUT) .untilAsserted( () -> { var actual = extension.get(PeriodicCleanerExpectationCustomResource.class, TEST_1); @@ -80,6 +82,7 @@ void demonstratesNoTriggerReconcilerOnAllEventsNeededForCleanup() { var created = extension.create(res); await() + .timeout(GARBAGE_COLLECTION_TIMEOUT) .untilAsserted( () -> { assertThat(reconciler.getExpectationManager().getExpectation(created)).isPresent(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/standalonedependent/StandaloneDependentResourceIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/standalonedependent/StandaloneDependentResourceIT.java index 3d9c15e807..a44b3e13f3 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/standalonedependent/StandaloneDependentResourceIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/standalonedependent/StandaloneDependentResourceIT.java @@ -93,7 +93,7 @@ void executeUpdateForTestingCacheUpdateForGetResource() { void awaitForDeploymentReadyReplicas(int expectedReplicaCount) { await() .pollInterval(Duration.ofMillis(300)) - .atMost(Duration.ofSeconds(50)) + .atMost(Duration.ofSeconds(180)) .until( () -> { var deployment = diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/complexdependent/ComplexWorkflowIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/complexdependent/ComplexWorkflowIT.java index 6357ec7888..5cc7814517 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/complexdependent/ComplexWorkflowIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/complexdependent/ComplexWorkflowIT.java @@ -55,7 +55,7 @@ void successfullyReconciles() { operator.create(testResource()); await() - .atMost(Duration.ofSeconds(90)) + .atMost(Duration.ofSeconds(120)) .untilAsserted( () -> { var res = operator.get(ComplexWorkflowCustomResource.class, TEST_RESOURCE_NAME); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowallfeature/WorkflowAllFeatureIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowallfeature/WorkflowAllFeatureIT.java index 41f68e42f7..4dc02c3fe9 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowallfeature/WorkflowAllFeatureIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowallfeature/WorkflowAllFeatureIT.java @@ -27,6 +27,7 @@ import io.javaoperatorsdk.annotation.Sample; import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension; +import static io.javaoperatorsdk.operator.IntegrationTestConstants.GARBAGE_COLLECTION_TIMEOUT; import static io.javaoperatorsdk.operator.workflow.workflowallfeature.ConfigMapDependentResource.READY_TO_DELETE_ANNOTATION; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -69,7 +70,7 @@ void configMapNotReconciledUntilDeploymentReady() { }); await() - .atMost(ONE_MINUTE) + .timeout(ONE_MINUTE) .untilAsserted( () -> { assertThat( @@ -107,6 +108,7 @@ void configMapNotReconciledIfReconcileConditionNotMet() { operator.replace(resource); await() + .timeout(GARBAGE_COLLECTION_TIMEOUT) .untilAsserted( () -> { assertThat(operator.get(ConfigMap.class, RESOURCE_NAME)).isNotNull(); @@ -141,7 +143,7 @@ void configMapNotDeletedUntilNotMarked() { markConfigMapForDelete(); await() - .atMost(ONE_MINUTE) + .timeout(GARBAGE_COLLECTION_TIMEOUT) .untilAsserted( () -> { assertThat(operator.get(ConfigMap.class, RESOURCE_NAME)).isNull();