Skip to content

Commit 76ec20a

Browse files
authored
fix: logging for flaky MySQLSchema E2E test (#3198)
1 parent b657909 commit 76ec20a

File tree

4 files changed

+16
-11
lines changed

4 files changed

+16
-11
lines changed

sample-operators/mysql-schema/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@
9090
<artifactId>operator-framework-junit</artifactId>
9191
<scope>test</scope>
9292
</dependency>
93+
<dependency>
94+
<groupId>org.assertj</groupId>
95+
<artifactId>assertj-core</artifactId>
96+
<scope>test</scope>
97+
</dependency>
9398
</dependencies>
9499

95100
<build>

sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SchemaDependentResource.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ private Connection getConnection() throws SQLException {
110110

111111
@Override
112112
public void delete(MySQLSchema primary, Context<MySQLSchema> context) {
113+
log.debug("Deleting schema");
113114
try (Connection connection = getConnection()) {
114115
var userName = primary.getStatus() != null ? primary.getStatus().getUserName() : null;
115116
SchemaService.deleteSchemaAndRelatedUser(

sample-operators/mysql-schema/src/main/resources/log4j2.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
</Console>
2424
</Appenders>
2525
<Loggers>
26-
<Root level="debug">
26+
<Logger level="debug" name="io.javaoperatorsdk.operator" additivity="false">
27+
<AppenderRef ref="Console"/>
28+
</Logger>
29+
<Root level="info">
2730
<AppenderRef ref="Console"/>
2831
</Root>
2932
</Loggers>

sample-operators/mysql-schema/src/test/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperatorE2E.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,8 @@
3636
import io.javaoperatorsdk.operator.sample.dependent.SchemaDependentResource;
3737

3838
import static java.util.concurrent.TimeUnit.MINUTES;
39+
import static org.assertj.core.api.Assertions.assertThat;
3940
import static org.awaitility.Awaitility.await;
40-
import static org.hamcrest.CoreMatchers.equalTo;
41-
import static org.hamcrest.CoreMatchers.is;
42-
import static org.hamcrest.MatcherAssert.assertThat;
43-
import static org.hamcrest.Matchers.notNullValue;
44-
import static org.hamcrest.Matchers.nullValue;
4541

4642
class MySQLSchemaOperatorE2E {
4743

@@ -114,10 +110,10 @@ void test() {
114110
.inNamespace(operator.getNamespace())
115111
.withName(testSchema.getMetadata().getName())
116112
.get();
117-
assertThat(updatedSchema.getStatus(), is(notNullValue()));
118-
assertThat(updatedSchema.getStatus().getStatus(), equalTo("CREATED"));
119-
assertThat(updatedSchema.getStatus().getSecretName(), is(notNullValue()));
120-
assertThat(updatedSchema.getStatus().getUserName(), is(notNullValue()));
113+
assertThat(updatedSchema.getStatus()).isNotNull();
114+
assertThat(updatedSchema.getStatus().getStatus()).isEqualTo("CREATED");
115+
assertThat(updatedSchema.getStatus().getSecretName()).isNotNull();
116+
assertThat(updatedSchema.getStatus().getUserName()).isNotNull();
121117
});
122118

123119
client
@@ -137,7 +133,7 @@ void test() {
137133
.inNamespace(operator.getNamespace())
138134
.withName(testSchema.getMetadata().getName())
139135
.get();
140-
assertThat(updatedSchema, is(nullValue()));
136+
assertThat(updatedSchema).isNull();
141137
});
142138
}
143139
}

0 commit comments

Comments
 (0)