From fead7a35cc0bf7f81b9bee1a5225723ceed7e47c Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Thu, 28 Feb 2019 14:57:16 +0100
Subject: [PATCH] Trying to make tests less brittle

---
 .../web/client/integration/WebClientTests.java       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java
index a856079c7..df95285da 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java
@@ -392,11 +392,13 @@ public class WebClientTests {
 			span.finish();
 		}
 
-		System.out.println("Found spans " + this.reporter.getSpans());
-		final Optional<zipkin2.Span> clientSpan = this.reporter.getSpans().stream()
-				.filter(s -> s.kind() == zipkin2.Span.Kind.CLIENT).findFirst();
-		then(clientSpan).isPresent();
-		then(clientSpan.get().tags()).containsEntry("error", "CANCELLED");
+		Awaitility.await().untilAsserted(() -> {
+			System.out.println("Found spans " + this.reporter.getSpans());
+			final Optional<zipkin2.Span> clientSpan = this.reporter.getSpans().stream()
+					.filter(s -> s.kind() == zipkin2.Span.Kind.CLIENT).findFirst();
+			then(clientSpan).isPresent();
+			then(clientSpan.get().tags()).containsEntry("error", "CANCELLED");
+		});
 	}
 
 	Object[] parametersForShouldAttachTraceIdWhenCallingAnotherService() {