From b4e85d04d8d990e347200bd87470609e2f5eac51 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 9 Feb 2016 10:34:30 +0100 Subject: [PATCH] [#148] Reseting the custom concurrency strategy before test class --- .../cloud/sleuth/instrument/hystrix/TraceCommandTests.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/TraceCommandTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/TraceCommandTests.java index 450049eb1..03c26e9dc 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/TraceCommandTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/TraceCommandTests.java @@ -19,6 +19,7 @@ import org.springframework.context.ApplicationEventPublisher; import com.netflix.hystrix.HystrixCommandProperties; import com.netflix.hystrix.HystrixThreadPoolProperties; +import com.netflix.hystrix.strategy.HystrixPlugins; public class TraceCommandTests { @@ -28,6 +29,7 @@ public class TraceCommandTests { @Before public void setup() { + HystrixPlugins.reset(); TestSpanContextHolder.removeCurrentSpan(); }