From 30944ed2e2dde9f61d5c51fd0b1e292bca896a29 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Mon, 27 May 2019 13:02:30 +0200 Subject: [PATCH] Attempt to make AbstractSchedulingTaskExecutorTests more robust --- .../AbstractSchedulingTaskExecutorTests.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/AbstractSchedulingTaskExecutorTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/AbstractSchedulingTaskExecutorTests.java index 533e87df55..ed8d839f3b 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/AbstractSchedulingTaskExecutorTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/AbstractSchedulingTaskExecutorTests.java @@ -155,8 +155,7 @@ public abstract class AbstractSchedulingTaskExecutorTests { .pollInterval(10, TimeUnit.MILLISECONDS) .untilAsserted(() -> assertThatExceptionOfType(CancellationException.class).isThrownBy(() -> - future2.get(1000, TimeUnit.MILLISECONDS) - )); + future2.get(1000, TimeUnit.MILLISECONDS))); } @Test @@ -181,10 +180,19 @@ public abstract class AbstractSchedulingTaskExecutorTests { Future future1 = executor.submit(new TestCallable(-1)); Future future2 = executor.submit(new TestCallable(-1)); shutdownExecutor(); - assertThatExceptionOfType(CancellationException.class).isThrownBy(() -> { + + try { future1.get(1000, TimeUnit.MILLISECONDS); - future2.get(1000, TimeUnit.MILLISECONDS); - }); + } + catch (Exception ex) { + /* ignore */ + } + Awaitility.await() + .atMost(4, TimeUnit.SECONDS) + .pollInterval(10, TimeUnit.MILLISECONDS) + .untilAsserted(() -> + assertThatExceptionOfType(CancellationException.class).isThrownBy(() -> + future2.get(1000, TimeUnit.MILLISECONDS))); } @Test