From a5a898a06bf1e538c8cc8cf3924294a9e085c042 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 12 May 2017 18:52:52 +0200 Subject: [PATCH] Trying to fix flickering tests --- .../cloud/sleuth/trace/CustomLoggerTests.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/trace/CustomLoggerTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/trace/CustomLoggerTests.java index 947448e0e..44a8eca0c 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/trace/CustomLoggerTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/trace/CustomLoggerTests.java @@ -16,21 +16,17 @@ package org.springframework.cloud.sleuth.trace; -import java.lang.invoke.MethodHandles; -import java.util.Random; -import java.util.concurrent.atomic.AtomicBoolean; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Test; -import org.springframework.cloud.sleuth.DefaultSpanNamer; -import org.springframework.cloud.sleuth.NoOpSpanReporter; -import org.springframework.cloud.sleuth.Span; -import org.springframework.cloud.sleuth.TraceKeys; -import org.springframework.cloud.sleuth.Tracer; +import org.springframework.cloud.sleuth.*; import org.springframework.cloud.sleuth.log.Slf4jSpanLogger; import org.springframework.cloud.sleuth.sampler.AlwaysSampler; +import java.lang.invoke.MethodHandles; +import java.util.Random; +import java.util.concurrent.atomic.AtomicBoolean; + import static org.springframework.cloud.sleuth.assertions.SleuthAssertions.then; /** @@ -51,6 +47,7 @@ public class CustomLoggerTests { then(child).hasBaggageItem("foo", "bar"); then(this.spanLogger.called.get()).isTrue(); + TestSpanContextHolder.removeCurrentSpan(); } }