Skip to content

fix: flaky integration test #1029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 14, 2022
Merged

fix: flaky integration test #1029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd9272e
fix: integration test
csviri Mar 14, 2022
234d02b
fix: improvements
csviri Mar 14, 2022
a720d95
fix: improvements
csviri Mar 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions operator-framework/src/test/java/io/javaoperatorsdk/operator/SubResourceUpdateIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@

class SubResourceUpdateIT {

public static final int WAIT_AFTER_EXECUTION = 500;
public static final int EVENT_RECEIVE_WAIT = 200;

@RegisterExtension
OperatorExtension operator =
OperatorExtension.builder()
Expand All @@ -34,7 +37,7 @@ void updatesSubResourceStatus() {

awaitStatusUpdated(resource.getMetadata().getName());
// wait for sure, there are no more events
waitXms(200);
waitXms(WAIT_AFTER_EXECUTION);
// there is no event on status update processed
assertThat(TestUtils.getNumberOfExecutions(operator))
.isEqualTo(2);
Expand All @@ -49,7 +52,7 @@ void updatesSubResourceStatusNoFinalizer() {

awaitStatusUpdated(resource.getMetadata().getName());
// wait for sure, there are no more events
waitXms(200);
waitXms(WAIT_AFTER_EXECUTION);
// there is no event on status update processed
assertThat(TestUtils.getNumberOfExecutions(operator))
.isEqualTo(2);
Expand All @@ -64,7 +67,7 @@ void ifNoFinalizerPresentFirstAddsTheFinalizerThenExecutesControllerAgain() {

awaitStatusUpdated(resource.getMetadata().getName());
// wait for sure, there are no more events
waitXms(200);
waitXms(WAIT_AFTER_EXECUTION);
// there is no event on status update processed
assertThat(TestUtils.getNumberOfExecutions(operator))
.isEqualTo(2);
Expand All @@ -81,13 +84,15 @@ void updateCustomResourceAfterSubResourceChange() {
SubResourceTestCustomResource resource = createTestCustomResource("1");
operator.create(SubResourceTestCustomResource.class, resource);

// waits for the resource to start processing
waitXms(EVENT_RECEIVE_WAIT);
resource.getSpec().setValue("new value");
operator.resources(SubResourceTestCustomResource.class).createOrReplace(resource);

awaitStatusUpdated(resource.getMetadata().getName());

// wait for sure, there are no more events
waitXms(500);
waitXms(WAIT_AFTER_EXECUTION);
// there is no event on status update processed
assertThat(TestUtils.getNumberOfExecutions(operator))
.isEqualTo(3);
Expand Down Expand Up @@ -121,7 +126,7 @@ public SubResourceTestCustomResource createTestCustomResource(String id) {
return resource;
}

private void waitXms(int x) {
public static void waitXms(int x) {
try {
Thread.sleep(x);
} catch (InterruptedException e) {
Expand Down
7 changes: 6 additions & 1 deletion .../java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomReconciler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,21 @@
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;

import static io.javaoperatorsdk.operator.support.TestUtils.waitXms;

@ControllerConfiguration(generationAwareEventProcessing = false)
public class SubResourceTestCustomReconciler
implements Reconciler<SubResourceTestCustomResource>, TestExecutionInfoProvider {

public static final int RECONCILER_MIN_EXEC_TIME = 300;

public static final String FINALIZER_NAME =
ReconcilerUtils.getDefaultFinalizerName(SubResourceTestCustomResource.class);
private static final Logger log =
LoggerFactory.getLogger(SubResourceTestCustomReconciler.class);
private final AtomicInteger numberOfExecutions = new AtomicInteger(0);


@Override
public UpdateControl<SubResourceTestCustomResource> reconcile(
SubResourceTestCustomResource resource, Context context) {
Expand All @@ -33,7 +38,7 @@ public UpdateControl<SubResourceTestCustomResource> reconcile(

ensureStatusExists(resource);
resource.getStatus().setState(SubResourceTestCustomResourceStatus.State.SUCCESS);

waitXms(RECONCILER_MIN_EXEC_TIME);
return UpdateControl.updateStatus(resource);
}

Expand Down