From e8ff4d8f4fe1ccefe8745093f53595697583775c Mon Sep 17 00:00:00 2001 From: Freeman Lau Date: Mon, 10 Jan 2022 15:01:16 +0800 Subject: [PATCH] fix: Adjust unit test configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增大 timeWindow 值, 降低单测不过情况的概率 --- ...gnClientCircuitBreakerRuleIntegrationTest.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-circuitbreaker-sentinel/src/test/java/com/alibaba/cloud/circuitbreaker/sentinel/feign/FeignClientCircuitBreakerRuleIntegrationTest.java b/spring-cloud-alibaba-starters/spring-cloud-circuitbreaker-sentinel/src/test/java/com/alibaba/cloud/circuitbreaker/sentinel/feign/FeignClientCircuitBreakerRuleIntegrationTest.java index f86735634..202426393 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-circuitbreaker-sentinel/src/test/java/com/alibaba/cloud/circuitbreaker/sentinel/feign/FeignClientCircuitBreakerRuleIntegrationTest.java +++ b/spring-cloud-alibaba-starters/spring-cloud-circuitbreaker-sentinel/src/test/java/com/alibaba/cloud/circuitbreaker/sentinel/feign/FeignClientCircuitBreakerRuleIntegrationTest.java @@ -42,19 +42,20 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen "feign.sentinel.default-rule=default", "feign.sentinel.rules.default[0].grade=2", "feign.sentinel.rules.default[0].count=2", - "feign.sentinel.rules.default[0].timeWindow=1", + "feign.sentinel.rules.default[0].timeWindow=2", "feign.sentinel.rules.default[0].statIntervalMs=1000", "feign.sentinel.rules.default[0].minRequestAmount=5", "feign.sentinel.rules.user[0].grade=2", "feign.sentinel.rules.user[0].count=2", - "feign.sentinel.rules.user[0].timeWindow=1", + "feign.sentinel.rules.user[0].timeWindow=2", "feign.sentinel.rules.user[0].statIntervalMs=1000", "feign.sentinel.rules.user[0].minRequestAmount=5", "feign.sentinel.rules.[user#specificFeignMethod(boolean)][0].grade=2", "feign.sentinel.rules.[user#specificFeignMethod(boolean)][0].count=1", - "feign.sentinel.rules.[user#specificFeignMethod(boolean)][0].timeWindow=1", + "feign.sentinel.rules.[user#specificFeignMethod(boolean)][0].timeWindow=2", "feign.sentinel.rules.[user#specificFeignMethod(boolean)][0].statIntervalMs=1000", - "feign.sentinel.rules.[user#specificFeignMethod(boolean)][0].minRequestAmount=5" }) + "feign.sentinel.rules.[user#specificFeignMethod(boolean)][0].minRequestAmount=5" +}) public class FeignClientCircuitBreakerRuleIntegrationTest { @Autowired @@ -86,7 +87,7 @@ public class FeignClientCircuitBreakerRuleIntegrationTest { assertThat(orderClient.defaultConfig(true)).isEqualTo("fallback"); // longer than timeWindow, circuit breaker half open - Thread.sleep(1100L); + Thread.sleep(2100L); // let circuit breaker close assertThat(orderClient.defaultConfig(true)).isEqualTo("ok"); @@ -117,7 +118,7 @@ public class FeignClientCircuitBreakerRuleIntegrationTest { assertThat(userClient.specificFeign(true)).isEqualTo("fallback"); // longer than timeWindow, circuit breaker half open - Thread.sleep(1100L); + Thread.sleep(2100L); // let circuit breaker close assertThat(userClient.specificFeign(true)).isEqualTo("ok"); @@ -149,7 +150,7 @@ public class FeignClientCircuitBreakerRuleIntegrationTest { assertThat(userClient.specificFeignMethod(true)).isEqualTo("fallback"); // longer than timeWindow, circuit breaker half open - Thread.sleep(1100L); + Thread.sleep(2100L); // let circuit breaker close assertThat(userClient.specificFeignMethod(true)).isEqualTo("ok");