Skip to content

Commit 793901a

Browse files
committed
fix a flaky test by cleaning additional CR
1 parent 491097a commit 793901a

File tree

4 files changed

+38
-2
lines changed

4 files changed

+38
-2
lines changed

operator/src/main/java/it/aboutbits/postgresql/crd/clusterconnection/ClusterConnectionReconciler.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,16 @@ public UpdateControl<ClusterConnection> reconcile(
2626
) {
2727
var status = initializeStatus(resource);
2828

29+
var name = resource.getMetadata().getName();
30+
var namespace = resource.getMetadata().getNamespace();
31+
32+
log.info(
33+
"Reconciling ClusterConnection [resource={}/{}, status.phase={}]",
34+
namespace,
35+
name,
36+
status.getPhase()
37+
);
38+
2939
try (var dsl = contextFactory.getDSLContext(resource)) {
3040
var version = dsl.fetchSingle("select version()").into(String.class);
3141

operator/src/test/java/it/aboutbits/postgresql/crd/clusterconnection/ClusterConnectionReconcilerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class ClusterConnectionReconcilerTest {
3333
private final Given given;
3434

3535
private final PostgreSQLContextFactory postgreSQLContextFactory;
36+
3637
private final KubernetesClient kubernetesClient;
3738

3839
@BeforeEach

operator/src/test/java/it/aboutbits/postgresql/crd/role/RoleReconcilerTest.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
import it.aboutbits.postgresql.core.PostgreSQLContextFactory;
1111
import it.aboutbits.postgresql.core.SecretRef;
1212
import it.aboutbits.postgresql.crd.clusterconnection.ClusterConnection;
13+
import it.aboutbits.postgresql.crd.database.Database;
14+
import it.aboutbits.postgresql.crd.grant.Grant;
15+
import it.aboutbits.postgresql.crd.schema.Schema;
1316
import lombok.RequiredArgsConstructor;
1417
import org.jooq.DSLContext;
1518
import org.jooq.Field;
@@ -51,6 +54,22 @@ class RoleReconcilerTest {
5154

5255
@BeforeEach
5356
void resetEnvironment() {
57+
kubernetesClient.resources(Grant.class).delete();
58+
59+
await().atMost(5, TimeUnit.SECONDS)
60+
.pollInterval(100, TimeUnit.MILLISECONDS)
61+
.until(() ->
62+
kubernetesClient.resources(Grant.class).list().getItems().isEmpty()
63+
);
64+
65+
kubernetesClient.resources(Schema.class).delete();
66+
67+
await().atMost(5, TimeUnit.SECONDS)
68+
.pollInterval(100, TimeUnit.MILLISECONDS)
69+
.until(() ->
70+
kubernetesClient.resources(Schema.class).list().getItems().isEmpty()
71+
);
72+
5473
kubernetesClient.resources(Role.class).delete();
5574

5675
await().atMost(5, TimeUnit.SECONDS)
@@ -59,6 +78,14 @@ void resetEnvironment() {
5978
kubernetesClient.resources(Role.class).list().getItems().isEmpty()
6079
);
6180

81+
kubernetesClient.resources(Database.class).delete();
82+
83+
await().atMost(5, TimeUnit.SECONDS)
84+
.pollInterval(100, TimeUnit.MILLISECONDS)
85+
.until(() ->
86+
kubernetesClient.resources(Database.class).list().getItems().isEmpty()
87+
);
88+
6289
kubernetesClient.resources(ClusterConnection.class).delete();
6390

6491
await().atMost(5, TimeUnit.SECONDS)

operator/src/test/java/it/aboutbits/postgresql/crd/schema/SchemaReconcilerTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import lombok.RequiredArgsConstructor;
1111
import org.jspecify.annotations.NullMarked;
1212
import org.junit.jupiter.api.BeforeEach;
13-
import org.junit.jupiter.api.Disabled;
1413
import org.junit.jupiter.api.DisplayName;
1514
import org.junit.jupiter.api.Test;
1615

@@ -52,7 +51,6 @@ void resetEnvironment() {
5251
);
5352
}
5453

55-
@Disabled("TODO Fix me when running the whole test suite")
5654
@Test
5755
@DisplayName("When a Schema is created, it should be reconciled to READY")
5856
void createSchema_andStatusReady() {

0 commit comments

Comments
 (0)