Attempt to make AbstractSchedulingTaskExecutorTests more robust

Author: sbrannen

spring-context/src/test/java/org/springframework/scheduling/concurrent/AbstractSchedulingTaskExecutorTests.java

@@ -155,8 +155,7 @@ public void submitListenableRunnableWithGetAfterShutdown() throws Exception {
 			.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 void submitCallableWithGetAfterShutdown() throws Exception {
 		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