Skip to content

Commit 098463d

Browse files
committed
fix: test
1 parent 3972845 commit 098463d

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowCleanupExecutor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ public void run() {
9696
// todo check if not garbage collected
9797
((Deleter<P>) dependentResourceNode.getDependentResource()).delete(primary, context);
9898
}
99+
alreadyVisited.add(dependentResourceNode);
99100
handleDependentCleaned(dependentResourceNode);
100101
} catch (RuntimeException e) {
101102
handleExceptionInExecutor(dependentResourceNode, e);

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ExecutionAssert.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ public ExecutionAssert notReconciled(DependentResource<?, ?>... dependentResourc
8484

8585
private void checkIfReconciled(int i, DependentResource<?, ?>[] dependentResources) {
8686
if (!getActualDependentResources().contains(dependentResources[i])) {
87-
failWithMessage("Dependent resource not reconciled on place %d", i);
87+
failWithMessage("Dependent resource: %s, not reconciled on place %d", dependentResources[i],
88+
i);
8889
}
8990
}
9091
}

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowCleanupExecutorTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.javaoperatorsdk.operator.processing.dependent.workflow;
22

3+
import org.junit.jupiter.api.Test;
4+
35
import io.javaoperatorsdk.operator.processing.dependent.workflow.builder.WorkflowBuilder;
46
import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
57

@@ -12,7 +14,7 @@ class WorkflowCleanupExecutorTest extends AbstractWorkflowExecutorTest {
1214
protected TestDeleterDependent dd2 = new TestDeleterDependent("DR_DELETER_2");
1315
protected TestDeleterDependent dd3 = new TestDeleterDependent("DR_DELETER_3");
1416

15-
// @Test
17+
@Test
1618
void cleanUpDiamondWorkflow() {
1719
var workflow = new WorkflowBuilder<TestCustomResource>()
1820
.addDependent(dd1).build()
@@ -23,7 +25,7 @@ void cleanUpDiamondWorkflow() {
2325

2426
workflow.cleanup(new TestCustomResource(), null);
2527

26-
assertThat(executionHistory).reconciledInOrder(dd1, dd2, dd3).reconciledInOrder();
28+
assertThat(executionHistory).reconciledInOrder(dd3, dd2, dd1).notReconciled(dr1);
2729
}
2830

2931

0 commit comments

Comments
 (0)