Skip to content

Commit 57a41b1

Browse files
authored
fix: flaky MultiVersionCRDIT (#1761)
1 parent 34b559e commit 57a41b1

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,18 @@ class MultiVersionCRDIT {
4141
.build();
4242

4343
private static class TestInformerStoppedHandler implements InformerStoppedHandler {
44-
private String resourceClassName;
45-
private String resourceCreateAsVersion;
44+
private volatile String resourceClassName;
45+
private volatile String resourceCreateAsVersion;
4646

47-
private String failedResourceVersion;
48-
private String errorMessage;
47+
private volatile String failedResourceVersion;
48+
private volatile String errorMessage;
49+
50+
public void reset() {
51+
resourceClassName = null;
52+
resourceCreateAsVersion = null;
53+
failedResourceVersion = null;
54+
errorMessage = null;
55+
}
4956

5057
@Override
5158
@SuppressWarnings("rawtypes")
@@ -111,6 +118,7 @@ private String acceptOnlyIfUnsetOrEqualToAlreadySet(String existing, String newV
111118

112119
@Test
113120
void multipleCRDVersions() {
121+
informerStoppedHandler.reset();
114122
operator.create(createTestResourceV1WithoutLabel());
115123
operator.create(createTestResourceV2WithLabel());
116124

@@ -132,6 +140,7 @@ void multipleCRDVersions() {
132140

133141
@Test
134142
void invalidEventsShouldStopInformerAndCallInformerStoppedHandler() {
143+
informerStoppedHandler.reset();
135144
var v2res = createTestResourceV2WithLabel();
136145
v2res.getMetadata().getLabels().clear();
137146
operator.create(v2res);

0 commit comments

Comments
 (0)