You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2019/06/28 07:56:49 UTC
[james-project] 07/07: Merge remote-tracking branch
'mine/JAMES-2792'
This is an automated email from the ASF dual-hosted git repository.
matthieu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 6eba0cc8a1137635eef30950352e80de5b2bdb23
Merge: 910bf3a 22fa06f
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Fri Jun 28 09:55:46 2019 +0200
Merge remote-tracking branch 'mine/JAMES-2792'
.../mpt/imapmailbox/external/james/DockerJamesRule.java | 14 +++++++++++++-
.../java/org/apache/james/util/docker/DockerContainer.java | 7 +++++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --cc mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/DockerJamesRule.java
index aa66159,48128e6..f7f586c
--- a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/DockerJamesRule.java
+++ b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/DockerJamesRule.java
@@@ -37,12 -41,20 +41,20 @@@ public class DockerJamesRule implement
private static final int SMTP_PORT = 587;
private static final int WEBADMIN_PORT = 8000;
- private final DockerGenericContainer container;
+ private final DockerContainer container;
public DockerJamesRule(String image) {
- container = new DockerGenericContainer(image)
+ container = DockerContainer.fromName(image)
.withExposedPorts(SMTP_PORT, IMAP_PORT)
- .waitingFor(new HostPortWaitStrategy());
+ .waitingFor(new HostPortWaitStrategy())
+ .withLogConsumer(frame -> {
+ switch (frame.getType()) {
+ case STDOUT:
+ LOGGER.info(frame.getUtf8String());
+ case STDERR:
+ LOGGER.error(frame.getUtf8String());
+ }
+ });
}
public ProvisioningAPI cliJarDomainsAndUsersAdder() throws InterruptedException, ProvisioningException, IOException {
diff --cc server/testing/src/main/java/org/apache/james/util/docker/DockerContainer.java
index 5c6a6c5,3e6847d..c2d45dd
--- a/server/testing/src/main/java/org/apache/james/util/docker/DockerContainer.java
+++ b/server/testing/src/main/java/org/apache/james/util/docker/DockerContainer.java
@@@ -23,8 -23,12 +23,9 @@@ import java.io.IOException
import java.time.Duration;
import java.util.List;
import java.util.Map;
+ import java.util.function.Consumer;
-import javax.net.SocketFactory;
-
-import org.junit.Assume;
+import org.junit.AssumptionViolatedException;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
@@@ -79,7 -88,12 +81,12 @@@ public class DockerContainer implement
return this;
}
+ public DockerGenericContainer withLogConsumer(Consumer<OutputFrame> consumer) {
+ container.withLogConsumer(consumer);
+ return this;
+ }
+
- public DockerGenericContainer withEnv(String key, String value) {
+ public DockerContainer withEnv(String key, String value) {
container.addEnv(key, value);
return this;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org