From ef327e98f6163a29018fc8e5833267dbb1994388 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Mon, 13 Nov 2023 14:35:13 -0500 Subject: [PATCH] Increase Timeouts in FTP RotatingServersTests Some unknown delays on MacOS cause the tests to fail. --- .../integration/ftp/inbound/RotatingServersTests.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/RotatingServersTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/RotatingServersTests.java index 62a15b7c4e..c42be0bb00 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/RotatingServersTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/RotatingServersTests.java @@ -135,7 +135,7 @@ public class RotatingServersTests extends FtpTestSupport { public void testStandard() throws Exception { try (AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(StandardConfig.class)) { StandardConfig config = ctx.getBean(StandardConfig.class); - assertThat(config.latch.await(10, TimeUnit.SECONDS)).isTrue(); + assertThat(config.latch.await(30, TimeUnit.SECONDS)).isTrue(); ctx.getBean(SourcePollingChannelAdapter.class).stop(); List sfCalls = config.sessionSources.stream().limit(17).collect(Collectors.toList()); assertThat(sfCalls).containsExactly(1, 1, 1, 2, 2, 2, 3, 3, 3, 1, 1, 2, 2, 3, 3, 1, 1); @@ -153,7 +153,7 @@ public class RotatingServersTests extends FtpTestSupport { public void testFair() throws Exception { try (AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(FairConfig.class)) { StandardConfig config = ctx.getBean(StandardConfig.class); - assertThat(config.latch.await(10, TimeUnit.SECONDS)).isTrue(); + assertThat(config.latch.await(30, TimeUnit.SECONDS)).isTrue(); ctx.getBean(SourcePollingChannelAdapter.class).stop(); List sfCalls = config.sessionSources.stream().limit(17).collect(Collectors.toList()); assertThat(sfCalls).containsExactly(1, 1, 2, 2, 3, 3, 1, 1, 2, 2, 3, 3, 1, 1, 2, 2, 3); @@ -171,7 +171,7 @@ public class RotatingServersTests extends FtpTestSupport { public void testVariableLocalDir() throws Exception { try (ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(VariableLocalConfig.class)) { StandardConfig config = ctx.getBean(StandardConfig.class); - assertThat(config.latch.await(10, TimeUnit.SECONDS)).isTrue(); + assertThat(config.latch.await(30, TimeUnit.SECONDS)).isTrue(); ctx.getBean(SourcePollingChannelAdapter.class).stop(); List sfCalls = config.sessionSources.stream().limit(17).collect(Collectors.toList()); assertThat(sfCalls).containsExactly(1, 1, 1, 2, 2, 2, 3, 3, 3, 1, 1, 2, 2, 3, 3, 1, 1); @@ -189,7 +189,7 @@ public class RotatingServersTests extends FtpTestSupport { public void testStreaming() throws Exception { try (AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(StreamingConfig.class)) { StandardConfig config = ctx.getBean(StreamingConfig.class); - assertThat(config.latch.await(10, TimeUnit.SECONDS)).isTrue(); + assertThat(config.latch.await(30, TimeUnit.SECONDS)).isTrue(); ctx.getBean(SourcePollingChannelAdapter.class).stop(); List sfCalls = config.sessionSources.stream().limit(17).collect(Collectors.toList()); // there's an extra getSession() with this adapter in listFiles @@ -212,7 +212,7 @@ public class RotatingServersTests extends FtpTestSupport { public void testFairStreaming() throws Exception { try (ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(FairStreamingConfig.class)) { StandardConfig config = ctx.getBean(StandardConfig.class); - assertThat(config.latch.await(10, TimeUnit.SECONDS)).isTrue(); + assertThat(config.latch.await(30, TimeUnit.SECONDS)).isTrue(); ctx.getBean(SourcePollingChannelAdapter.class).stop(); List sfCalls = config.sessionSources.stream().limit(17).collect(Collectors.toList()); assertThat(sfCalls).containsExactly(1, 1, 2, 2, 3, 3, 1, 1, 2, 2, 3, 3, 1, 2, 3, 1, 2);