JAMES-2588 increase timeout for starting SpamAssassin docker
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f5c091ea Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f5c091ea Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f5c091ea Branch: refs/heads/3.2.x Commit: f5c091ea14c5765786507fdc6c72fa9013dbe22f Parents: acd245f Author: Benoit Tellier <btell...@linagora.com> Authored: Tue Nov 13 14:23:42 2018 +0700 Committer: Antoine Duprat <adup...@linagora.com> Committed: Tue Dec 11 15:36:05 2018 +0100 ---------------------------------------------------------------------- .../org/apache/james/spamassassin/SpamAssassinExtension.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/f5c091ea/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java ---------------------------------------------------------------------- diff --git a/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java b/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java index fd4980c..5018bd6 100644 --- a/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java +++ b/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java @@ -24,6 +24,7 @@ import java.net.URISyntaxException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.time.Duration; import java.util.Locale; import java.util.stream.Stream; @@ -39,6 +40,7 @@ import org.testcontainers.images.builder.ImageFromDockerfile; import com.github.fge.lambdas.Throwing; public class SpamAssassinExtension implements BeforeEachCallback, AfterEachCallback, ParameterResolver { + private static final Duration STARTUP_TIMEOUT = Duration.ofMinutes(30); private final GenericContainer<?> spamAssassinContainer; private SpamAssassin spamAssassin; @@ -51,8 +53,9 @@ public class SpamAssassinExtension implements BeforeEachCallback, AfterEachCallb .withFileFromClasspath("run.sh", "docker/spamassassin/run.sh") .withFileFromClasspath("spamd.sh", "docker/spamassassin/spamd.sh") .withFileFromClasspath("rule-update.sh", "docker/spamassassin/rule-update.sh") - .withFileFromClasspath("bayes_pg.sql", "docker/spamassassin/bayes_pg.sql")); - spamAssassinContainer.waitingFor(new SpamAssassinWaitStrategy(spamAssassinContainer)); + .withFileFromClasspath("bayes_pg.sql", "docker/spamassassin/bayes_pg.sql")) + .withStartupTimeout(STARTUP_TIMEOUT); + spamAssassinContainer.waitingFor(new SpamAssassinWaitStrategy(spamAssassinContainer, STARTUP_TIMEOUT)); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
