You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/07/04 06:39:02 UTC
[camel] branch master updated (49c804a -> 5ab9667)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 49c804a Fixed CS for Camel-Salesforce
new d5b64b1 Camel-NSQ: Wait for message in logs for the container initialization in tests
new 5ab9667 Camel-NSQ: Use v1.1.0 tag for used docker images
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../test/java/org/apache/camel/component/nsq/NsqTestSupport.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
[camel] 02/02: Camel-NSQ: Use v1.1.0 tag for used docker images
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5ab96674a2b0f7b10ee1c68389aa68f8c8c86151
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jul 4 08:38:31 2019 +0200
Camel-NSQ: Use v1.1.0 tag for used docker images
---
.../src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java
index 1c2bff6..d2e980d 100644
--- a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java
+++ b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java
@@ -28,10 +28,10 @@ import org.testcontainers.containers.Network;
public class NsqTestSupport extends ContainerAwareTestSupport {
- public static final String CONTAINER_NSQLOOKUPD_IMAGE = "nsqio/nsq";
+ public static final String CONTAINER_NSQLOOKUPD_IMAGE = "nsqio/nsq:v1.1.0";
public static final String CONTAINER_NSQLOOKUPD_NAME = "nsqlookupd";
- public static final String CONTAINER_NSQD_IMAGE = "nsqio/nsq";
+ public static final String CONTAINER_NSQD_IMAGE = "nsqio/nsq:v1.1.0";
public static final String CONTAINER_NSQD_NAME = "nsqd";
Network network;
[camel] 01/02: Camel-NSQ: Wait for message in logs for the
container initialization in tests
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d5b64b111acc4666a1a9976cb3b7c03485f12893
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jul 4 08:23:57 2019 +0200
Camel-NSQ: Wait for message in logs for the container initialization in tests
---
.../src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java
index 5271c63..1c2bff6 100644
--- a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java
+++ b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java
@@ -21,6 +21,7 @@ import java.util.Arrays;
import java.util.List;
import org.apache.camel.test.testcontainers.ContainerAwareTestSupport;
+import org.apache.camel.test.testcontainers.Wait;
import org.testcontainers.containers.FixedHostPortGenericContainer;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.Network;
@@ -43,12 +44,12 @@ public class NsqTestSupport extends ContainerAwareTestSupport {
public static GenericContainer<?> nsqlookupdContainer(Network network) {
return new FixedHostPortGenericContainer<>(CONTAINER_NSQLOOKUPD_IMAGE).withFixedExposedPort(4160, 4160).withFixedExposedPort(4161, 4161)
- .withNetworkAliases(CONTAINER_NSQLOOKUPD_NAME).withCommand("/nsqlookupd").withNetwork(network);
+ .withNetworkAliases(CONTAINER_NSQLOOKUPD_NAME).withCommand("/nsqlookupd").withNetwork(network).waitingFor(Wait.forLogMessageContaining("TCP: listening on", 1));
}
public static GenericContainer<?> nsqdContainer(Network network) {
return new FixedHostPortGenericContainer<>(CONTAINER_NSQD_IMAGE).withFixedExposedPort(4150, 4150).withFixedExposedPort(4151, 4151).withNetworkAliases(CONTAINER_NSQD_NAME)
- .withCommand(String.format("/nsqd --broadcast-address=%s --lookupd-tcp-address=%s:4160", "localhost", CONTAINER_NSQLOOKUPD_NAME)).withNetwork(network);
+ .withCommand(String.format("/nsqd --broadcast-address=%s --lookupd-tcp-address=%s:4160", "localhost", CONTAINER_NSQLOOKUPD_NAME)).withNetwork(network).waitingFor(Wait.forLogMessageContaining("TCP: listening on", 1));
}
public String getNsqConsumerUrl() {