From 083000f29e1b26532f6130a435d2a3867baec579 Mon Sep 17 00:00:00 2001 From: csviri Date: Mon, 27 Mar 2023 13:50:58 +0200 Subject: [PATCH 1/2] fix: flaky special integration test --- .../operator/InformerRelatedBehaviorITS.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/InformerRelatedBehaviorITS.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/InformerRelatedBehaviorITS.java index 8fa0186bba..871d3f42ae 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/InformerRelatedBehaviorITS.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/InformerRelatedBehaviorITS.java @@ -2,6 +2,8 @@ import java.time.Duration; +import io.fabric8.kubernetes.api.model.ConfigMap; +import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import org.junit.jupiter.api.*; import io.fabric8.kubernetes.api.model.Namespace; @@ -71,6 +73,7 @@ void beforeEach(TestInfo testInfo) { @AfterEach void cleanup() { adminClient.resource(testCustomResource()).delete(); + adminClient.resource(dependentConfigMap()).delete(); } @Test @@ -149,7 +152,7 @@ private void assertInformerNotWatchingForAdditionalNamespace(Operator operator) } @Test - void resilientForLoosingPermissionForCustomResource() throws InterruptedException { + void resilientForLoosingPermissionForCustomResource() { setFullResourcesAccess(); startOperator(true); setNoCustomResourceAccess(); @@ -228,6 +231,14 @@ InformerRelatedBehaviorTestCustomResource testCustomResource() { .build()); return testCustomResource; } + private ConfigMap dependentConfigMap() { + return new ConfigMapBuilder() + .withMetadata(new ObjectMetaBuilder() + .withName(TEST_RESOURCE_NAME) + .withNamespace(actualNamespace) + .build()) + .build(); + } private void assertReconciled() { await().untilAsserted(() -> { From 47ae2ac66413bc83d25edc12820602ef8936e697 Mon Sep 17 00:00:00 2001 From: csviri Date: Mon, 27 Mar 2023 13:56:37 +0200 Subject: [PATCH 2/2] fix format --- .../operator/InformerRelatedBehaviorITS.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/InformerRelatedBehaviorITS.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/InformerRelatedBehaviorITS.java index 871d3f42ae..26f544bd90 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/InformerRelatedBehaviorITS.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/InformerRelatedBehaviorITS.java @@ -2,10 +2,10 @@ import java.time.Duration; -import io.fabric8.kubernetes.api.model.ConfigMap; -import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import org.junit.jupiter.api.*; +import io.fabric8.kubernetes.api.model.ConfigMap; +import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.Namespace; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; import io.fabric8.kubernetes.api.model.rbac.ClusterRole; @@ -231,13 +231,14 @@ InformerRelatedBehaviorTestCustomResource testCustomResource() { .build()); return testCustomResource; } + private ConfigMap dependentConfigMap() { return new ConfigMapBuilder() - .withMetadata(new ObjectMetaBuilder() - .withName(TEST_RESOURCE_NAME) - .withNamespace(actualNamespace) - .build()) - .build(); + .withMetadata(new ObjectMetaBuilder() + .withName(TEST_RESOURCE_NAME) + .withNamespace(actualNamespace) + .build()) + .build(); } private void assertReconciled() {