Skip to content

try to fix flaky test #718

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 1 commit into from
Mar 25, 2020
Merged

try to fix flaky test #718

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 11 additions & 7 deletions .../springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplierTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@

import java.time.Duration;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;

import org.assertj.core.api.Assertions;
import org.assertj.core.util.Lists;
import org.awaitility.Awaitility;
import org.junit.Ignore;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -467,27 +467,31 @@ protected Flux<List<ServiceInstance>> healthCheckFlux(
Assertions.assertThat(emitCounter).hasValue(1);
}

@Ignore // Fixme: see https://github.com/spring-cloud/spring-cloud-commons/issues/716
@Test
void shouldCancelSubscription() {

final AtomicInteger instancesCanceled = new AtomicInteger();

final AtomicBoolean subscribed = new AtomicBoolean();
ServiceInstanceListSupplier delegate = Mockito
.mock(ServiceInstanceListSupplier.class);
Mockito.when(delegate.get()).thenReturn(Flux.<List<ServiceInstance>>never()
.log("test").doOnCancel(instancesCanceled::incrementAndGet));
Mockito.when(delegate.get())
.thenReturn(Flux.<List<ServiceInstance>>never()
.doOnSubscribe(subscription -> subscribed.set(true))
.doOnCancel(instancesCanceled::incrementAndGet));

listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, healthCheck,
webClient);

listSupplier.afterPropertiesSet();

Awaitility.await("delegate subscription").pollDelay(Duration.ofMillis(50))
.atMost(VERIFY_TIMEOUT).untilTrue(subscribed);

Assertions.assertThat(instancesCanceled).hasValue(0);

listSupplier.destroy();
Awaitility.await().pollDelay(Duration.ofMillis(100)).atMost(VERIFY_TIMEOUT)
.untilAsserted(
Awaitility.await("delegate cancellation").pollDelay(Duration.ofMillis(100))
.atMost(VERIFY_TIMEOUT).untilAsserted(
() -> Assertions.assertThat(instancesCanceled).hasValue(1));
}

Expand Down