Skip to content

improve: timeouts for integration test #3121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
csviri merged 1 commit into from
Jan 14, 2026
Merged

improve: timeouts for integration test #3121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
3 changes: 3 additions & 0 deletions ...c/test/java/io/javaoperatorsdk/operator/baseapi/expectation/onallevent/ExpectationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -52,6 +53,7 @@ void testExpectation() {
extension.create(res);

await()
.timeout(GARBAGE_COLLECTION_TIMEOUT)
.untilAsserted(
() -> {
var actual = extension.get(ExpectationCustomResource.class, TEST_1);
Expand All @@ -67,6 +69,7 @@ void expectationTimeouts() {
extension.create(res);

await()
.timeout(GARBAGE_COLLECTION_TIMEOUT)
.untilAsserted(
() -> {
var actual = extension.get(ExpectationCustomResource.class, TEST_1);
Expand Down
3 changes: 3 additions & 0 deletions ...aoperatorsdk/operator/baseapi/expectation/periodicclean/PeriodicCleanerExpectationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -57,6 +58,7 @@ void testPeriodicCleanerExpectationBasicFlow() {
extension.create(res);

await()
.timeout(GARBAGE_COLLECTION_TIMEOUT)
.untilAsserted(
() -> {
var actual = extension.get(PeriodicCleanerExpectationCustomResource.class, TEST_1);
Expand All @@ -80,6 +82,7 @@ void demonstratesNoTriggerReconcilerOnAllEventsNeededForCleanup() {
var created = extension.create(res);

await()
.timeout(GARBAGE_COLLECTION_TIMEOUT)
.untilAsserted(
() -> {
assertThat(reconciler.getExpectationManager().getExpectation(created)).isPresent();
Expand Down
2 changes: 1 addition & 1 deletion ...javaoperatorsdk/operator/dependent/standalonedependent/StandaloneDependentResourceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/java/io/javaoperatorsdk/operator/workflow/complexdependent/ComplexWorkflowIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 4 additions & 2 deletions ...st/java/io/javaoperatorsdk/operator/workflow/workflowallfeature/WorkflowAllFeatureIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -69,7 +70,7 @@ void configMapNotReconciledUntilDeploymentReady() {
});

await()
.atMost(ONE_MINUTE)
.timeout(ONE_MINUTE)
.untilAsserted(
() -> {
assertThat(
Expand Down Expand Up @@ -107,6 +108,7 @@ void configMapNotReconciledIfReconcileConditionNotMet() {
operator.replace(resource);

await()
.timeout(GARBAGE_COLLECTION_TIMEOUT)
.untilAsserted(
() -> {
assertThat(operator.get(ConfigMap.class, RESOURCE_NAME)).isNotNull();
Expand Down Expand Up @@ -141,7 +143,7 @@ void configMapNotDeletedUntilNotMarked() {
markConfigMapForDelete();

await()
.atMost(ONE_MINUTE)
.timeout(GARBAGE_COLLECTION_TIMEOUT)
.untilAsserted(
() -> {
assertThat(operator.get(ConfigMap.class, RESOURCE_NAME)).isNull();
Expand Down