From 7c6c32cb87b6161f181ef9435cf04c68202ad8b7 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 31 Jul 2020 15:04:39 -0400 Subject: [PATCH 1/7] Mock property source name --- .../encrypt/EnvironmentDecryptApplicationInitializerTests.java | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializerTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializerTests.java index 5136c67b..1c20e894 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializerTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializerTests.java @@ -187,6 +187,7 @@ public class EnvironmentDecryptApplicationInitializerTests { Collections.singletonMap("key", "{cipher}value2")); CompositePropertySource cps = mock(CompositePropertySource.class); + when(cps.getName()).thenReturn("mockpropertysource"); when(cps.getPropertyNames()).thenReturn(devProfile.getPropertyNames()); when(cps.getPropertySources()) .thenReturn(Arrays.asList(devProfile, defaultProfile)); From 828912100fca72b0efdd949279337d123af452a5 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 31 Jul 2020 15:35:14 -0400 Subject: [PATCH 2/7] Disables failing test. See gh-802 --- .../core/DiscoveryClientServiceInstanceListSupplierTests.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplierTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplierTests.java index 980f7365..2e188cfe 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplierTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplierTests.java @@ -20,6 +20,7 @@ import java.time.Duration; import org.assertj.core.util.Lists; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.mockito.internal.stubbing.answers.AnswersWithDelay; import org.mockito.internal.stubbing.answers.Returns; @@ -172,6 +173,7 @@ class DiscoveryClientServiceInstanceListSupplierTests { .verify(VERIFICATION_TIMEOUT); } + @Disabled // see https://github.com/spring-cloud/spring-cloud-commons/issues/802 @Test void shouldReturnEmptyInstancesListOnTimeoutBlockingClient() { environment.setProperty(SERVICE_DISCOVERY_TIMEOUT, "100ms"); From f290f97816c126961ba0d0e390f57d58a4984819 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 31 Jul 2020 19:59:52 +0000 Subject: [PATCH 3/7] Update SNAPSHOT to 2.2.4.RELEASE --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-commons-dependencies/pom.xml | 4 ++-- spring-cloud-commons/pom.xml | 2 +- spring-cloud-context-integration-tests/pom.xml | 2 +- spring-cloud-context-webflux-integration-tests/pom.xml | 2 +- spring-cloud-context/pom.xml | 2 +- spring-cloud-loadbalancer/pom.xml | 2 +- spring-cloud-starter-loadbalancer/pom.xml | 2 +- spring-cloud-starter/pom.xml | 2 +- spring-cloud-test-support/pom.xml | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index b7d95045..b657dff9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE pom Spring Cloud Commons Docs diff --git a/pom.xml b/pom.xml index f19618bb..e5590d6f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE pom Spring Cloud Commons Parent Spring Cloud Commons Parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 2.3.1.BUILD-SNAPSHOT + 2.3.1.RELEASE diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index a703aae1..afc3fd4c 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.1.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-commons-dependencies - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE pom spring-cloud-commons-dependencies Spring Cloud Commons Dependencies diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index dad3443d..65397479 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-commons diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml index c7e8f0e0..7ebad950 100644 --- a/spring-cloud-context-integration-tests/pom.xml +++ b/spring-cloud-context-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-context-integration-tests diff --git a/spring-cloud-context-webflux-integration-tests/pom.xml b/spring-cloud-context-webflux-integration-tests/pom.xml index 32fa514c..f0e9af7a 100644 --- a/spring-cloud-context-webflux-integration-tests/pom.xml +++ b/spring-cloud-context-webflux-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-context-webflux-integration-tests diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index 8cc0361a..a3a5c51f 100644 --- a/spring-cloud-context/pom.xml +++ b/spring-cloud-context/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-context diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml index 00cfb336..3ceb16db 100644 --- a/spring-cloud-loadbalancer/pom.xml +++ b/spring-cloud-loadbalancer/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-loadbalancer diff --git a/spring-cloud-starter-loadbalancer/pom.xml b/spring-cloud-starter-loadbalancer/pom.xml index 4498e418..14dcb7b9 100644 --- a/spring-cloud-starter-loadbalancer/pom.xml +++ b/spring-cloud-starter-loadbalancer/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE .. 4.0.0 diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index 2a5d18c2..3be1b26a 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE spring-cloud-starter spring-cloud-starter diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index add88755..e89acb79 100644 --- a/spring-cloud-test-support/pom.xml +++ b/spring-cloud-test-support/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-test-support From 4cc1a68ebba92a3198361ab50673d3161f43d216 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 31 Jul 2020 20:03:49 +0000 Subject: [PATCH 4/7] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-commons-dependencies/pom.xml | 4 ++-- spring-cloud-commons/pom.xml | 2 +- spring-cloud-context-integration-tests/pom.xml | 2 +- spring-cloud-context-webflux-integration-tests/pom.xml | 2 +- spring-cloud-context/pom.xml | 2 +- spring-cloud-loadbalancer/pom.xml | 2 +- spring-cloud-starter-loadbalancer/pom.xml | 2 +- spring-cloud-starter/pom.xml | 2 +- spring-cloud-test-support/pom.xml | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index b657dff9..b7d95045 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT pom Spring Cloud Commons Docs diff --git a/pom.xml b/pom.xml index e5590d6f..f19618bb 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT pom Spring Cloud Commons Parent Spring Cloud Commons Parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 2.3.1.RELEASE + 2.3.1.BUILD-SNAPSHOT diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index afc3fd4c..a703aae1 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.1.RELEASE + 2.3.1.BUILD-SNAPSHOT spring-cloud-commons-dependencies - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT pom spring-cloud-commons-dependencies Spring Cloud Commons Dependencies diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index 65397479..dad3443d 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-commons diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml index 7ebad950..c7e8f0e0 100644 --- a/spring-cloud-context-integration-tests/pom.xml +++ b/spring-cloud-context-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-context-integration-tests diff --git a/spring-cloud-context-webflux-integration-tests/pom.xml b/spring-cloud-context-webflux-integration-tests/pom.xml index f0e9af7a..32fa514c 100644 --- a/spring-cloud-context-webflux-integration-tests/pom.xml +++ b/spring-cloud-context-webflux-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-context-webflux-integration-tests diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index a3a5c51f..8cc0361a 100644 --- a/spring-cloud-context/pom.xml +++ b/spring-cloud-context/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-context diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml index 3ceb16db..00cfb336 100644 --- a/spring-cloud-loadbalancer/pom.xml +++ b/spring-cloud-loadbalancer/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-loadbalancer diff --git a/spring-cloud-starter-loadbalancer/pom.xml b/spring-cloud-starter-loadbalancer/pom.xml index 14dcb7b9..4498e418 100644 --- a/spring-cloud-starter-loadbalancer/pom.xml +++ b/spring-cloud-starter-loadbalancer/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 4.0.0 diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index 3be1b26a..2a5d18c2 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT spring-cloud-starter spring-cloud-starter diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index e89acb79..add88755 100644 --- a/spring-cloud-test-support/pom.xml +++ b/spring-cloud-test-support/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-test-support From 6b8776bd3aabf62e265586612b79fd27ce7a0e78 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 31 Jul 2020 20:03:49 +0000 Subject: [PATCH 5/7] Bumping versions to 2.2.5.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-commons-dependencies/pom.xml | 4 ++-- spring-cloud-commons/pom.xml | 2 +- spring-cloud-context-integration-tests/pom.xml | 2 +- spring-cloud-context-webflux-integration-tests/pom.xml | 2 +- spring-cloud-context/pom.xml | 2 +- spring-cloud-loadbalancer/pom.xml | 2 +- spring-cloud-starter-loadbalancer/pom.xml | 2 +- spring-cloud-starter/pom.xml | 2 +- spring-cloud-test-support/pom.xml | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index b7d95045..c66cce0b 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT pom Spring Cloud Commons Docs diff --git a/pom.xml b/pom.xml index f19618bb..00a6c339 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT pom Spring Cloud Commons Parent Spring Cloud Commons Parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 2.3.1.BUILD-SNAPSHOT + 2.3.1.RELEASE diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index a703aae1..eee79288 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.1.BUILD-SNAPSHOT + 2.3.2.BUILD-SNAPSHOT spring-cloud-commons-dependencies - 2.2.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT pom spring-cloud-commons-dependencies Spring Cloud Commons Dependencies diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index dad3443d..462b60f4 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-commons diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml index c7e8f0e0..be6c9673 100644 --- a/spring-cloud-context-integration-tests/pom.xml +++ b/spring-cloud-context-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-context-integration-tests diff --git a/spring-cloud-context-webflux-integration-tests/pom.xml b/spring-cloud-context-webflux-integration-tests/pom.xml index 32fa514c..82225877 100644 --- a/spring-cloud-context-webflux-integration-tests/pom.xml +++ b/spring-cloud-context-webflux-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-context-webflux-integration-tests diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index 8cc0361a..2651cbd8 100644 --- a/spring-cloud-context/pom.xml +++ b/spring-cloud-context/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-context diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml index 00cfb336..c8dd74e3 100644 --- a/spring-cloud-loadbalancer/pom.xml +++ b/spring-cloud-loadbalancer/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-loadbalancer diff --git a/spring-cloud-starter-loadbalancer/pom.xml b/spring-cloud-starter-loadbalancer/pom.xml index 4498e418..c68614f7 100644 --- a/spring-cloud-starter-loadbalancer/pom.xml +++ b/spring-cloud-starter-loadbalancer/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT .. 4.0.0 diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index 2a5d18c2..1e57136f 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT spring-cloud-starter spring-cloud-starter diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index add88755..74f1af7c 100644 --- a/spring-cloud-test-support/pom.xml +++ b/spring-cloud-test-support/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-test-support From 0be2794631f0ee1690bfda147535d649b33825a2 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 3 Aug 2020 12:54:28 -0400 Subject: [PATCH 6/7] Fixes s-c-build version to snapshot --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 00a6c339..5cf70e02 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 2.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT From 018aae36328c69b7e81b629bcd176d9b36b2fc8f Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 11 Aug 2020 13:05:07 +0200 Subject: [PATCH 7/7] Subscribe on flux earlier. Fixes gh-802. --- .../core/DiscoveryClientServiceInstanceListSupplier.java | 3 ++- .../core/DiscoveryClientServiceInstanceListSupplierTests.java | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplier.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplier.java index f0d9b585..79d22a95 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplier.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplier.java @@ -64,13 +64,14 @@ public class DiscoveryClientServiceInstanceListSupplier resolveTimeout(environment); this.serviceInstances = Flux .defer(() -> Flux.just(delegate.getInstances(serviceId))) + .subscribeOn(Schedulers.boundedElastic()) .timeout(timeout, Flux.defer(() -> { logTimeout(); return Flux.just(new ArrayList<>()); })).onErrorResume(error -> { logException(error); return Flux.just(new ArrayList<>()); - }).subscribeOn(Schedulers.boundedElastic()); + }); } public DiscoveryClientServiceInstanceListSupplier(ReactiveDiscoveryClient delegate, diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplierTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplierTests.java index 2e188cfe..980f7365 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplierTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplierTests.java @@ -20,7 +20,6 @@ import java.time.Duration; import org.assertj.core.util.Lists; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.mockito.internal.stubbing.answers.AnswersWithDelay; import org.mockito.internal.stubbing.answers.Returns; @@ -173,7 +172,6 @@ class DiscoveryClientServiceInstanceListSupplierTests { .verify(VERIFICATION_TIMEOUT); } - @Disabled // see https://github.com/spring-cloud/spring-cloud-commons/issues/802 @Test void shouldReturnEmptyInstancesListOnTimeoutBlockingClient() { environment.setProperty(SERVICE_DISCOVERY_TIMEOUT, "100ms");