You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2021/12/12 05:58:05 UTC
[pulsar] 01/02: Upgrade TestContainers to 1.15.1 (#9120)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit dda795d3f8a1ffa766a10902295576afafca86ec
Author: Matteo Merli <mm...@apache.org>
AuthorDate: Tue Jan 5 21:21:52 2021 -0800
Upgrade TestContainers to 1.15.1 (#9120)
* Upgrade TestContainers to 1.15.1
* Fixed testcontainers upgrade issues
(cherry picked from commit f817f3fb1cf6bb6ed47c06bb9ebbcbc3fdacc96d)
---
pom.xml | 9 ++++++++-
tests/integration/pom.xml | 6 ++++++
.../pulsar/tests/integration/containers/ChaosContainer.java | 10 +++++-----
.../tests/integration/containers/PrestoWorkerContainer.java | 4 ++--
.../pulsar/tests/integration/containers/PulsarContainer.java | 8 ++++----
.../pulsar/tests/integration/containers/WorkerContainer.java | 4 ++--
.../pulsar/tests/integration/containers/ZKContainer.java | 4 ++--
7 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 25dbc38..b4a7f5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -180,11 +180,12 @@ flexible messaging model and an intuitive client API.</description>
<jna.version>4.2.0</jna.version>
<kubernetesclient.version>9.0.2</kubernetesclient.version>
<nsq-client.version>1.0</nsq-client.version>
+ <docker-java.version>3.2.7</docker-java.version>
<!-- test dependencies -->
<cassandra.version>3.6.0</cassandra.version>
<disruptor.version>3.4.0</disruptor.version>
- <testcontainers.version>1.14.3</testcontainers.version>
+ <testcontainers.version>1.15.1</testcontainers.version>
<kerby.version>1.1.1</kerby.version>
<testng.version>7.3.0</testng.version>
<mockito.version>3.0.0</mockito.version>
@@ -594,6 +595,12 @@ flexible messaging model and an intuitive client API.</description>
<artifactId>jna</artifactId>
<version>${jna.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>com.github.docker-java</groupId>
+ <artifactId>docker-java-core</artifactId>
+ <version>${docker-java.version}</version>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml
index 6e9eb42..1a15a7e 100644
--- a/tests/integration/pom.xml
+++ b/tests/integration/pom.xml
@@ -121,6 +121,12 @@
</dependency>
<dependency>
+ <groupId>com.github.docker-java</groupId>
+ <artifactId>docker-java-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-io-jdbc-postgres</artifactId>
<version>${project.version}</version>
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ChaosContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ChaosContainer.java
index a66f635..cf5a884 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ChaosContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ChaosContainer.java
@@ -47,14 +47,14 @@ public class ChaosContainer<SelfT extends ChaosContainer<SelfT>> extends Generic
}
protected void beforeStop() {
- if (null == containerId) {
+ if (null == getContainerId()) {
return;
}
// dump the container log
DockerUtils.dumpContainerLogToTarget(
getDockerClient(),
- containerId
+ getContainerId()
);
}
@@ -66,7 +66,7 @@ public class ChaosContainer<SelfT extends ChaosContainer<SelfT>> extends Generic
public void tailContainerLog() {
CompletableFuture.runAsync(() -> {
- while (null == containerId) {
+ while (null == getContainerId()) {
try {
TimeUnit.MILLISECONDS.sleep(100);
} catch (InterruptedException e) {
@@ -74,7 +74,7 @@ public class ChaosContainer<SelfT extends ChaosContainer<SelfT>> extends Generic
}
}
- LogContainerCmd logContainerCmd = this.dockerClient.logContainerCmd(containerId);
+ LogContainerCmd logContainerCmd = this.dockerClient.logContainerCmd(getContainerId());
logContainerCmd.withStdOut(true).withStdErr(true).withFollowStream(true);
logContainerCmd.exec(new LogContainerResultCallback() {
@Override
@@ -88,7 +88,7 @@ public class ChaosContainer<SelfT extends ChaosContainer<SelfT>> extends Generic
public String getContainerLog() {
StringBuilder sb = new StringBuilder();
- LogContainerCmd logContainerCmd = this.dockerClient.logContainerCmd(containerId);
+ LogContainerCmd logContainerCmd = this.dockerClient.logContainerCmd(getContainerId());
logContainerCmd.withStdOut(true).withStdErr(true);
try {
logContainerCmd.exec(new LogContainerResultCallback() {
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PrestoWorkerContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PrestoWorkerContainer.java
index 9462363..7c6c9d6 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PrestoWorkerContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PrestoWorkerContainer.java
@@ -52,10 +52,10 @@ public class PrestoWorkerContainer extends PulsarContainer<PrestoWorkerContainer
@Override
protected void beforeStop() {
super.beforeStop();
- if (null != containerId) {
+ if (null != getContainerId()) {
DockerUtils.dumpContainerDirToTargetCompressed(
getDockerClient(),
- containerId,
+ getContainerId(),
"/pulsar/lib/presto/var/log"
);
}
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PulsarContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PulsarContainer.java
index f13875a..8c6a5d8 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PulsarContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PulsarContainer.java
@@ -100,10 +100,10 @@ public abstract class PulsarContainer<SelfT extends PulsarContainer<SelfT>> exte
@Override
protected void beforeStop() {
super.beforeStop();
- if (null != containerId) {
+ if (null != getContainerId()) {
DockerUtils.dumpContainerDirToTargetCompressed(
getDockerClient(),
- containerId,
+ getContainerId(),
"/var/log/pulsar"
);
}
@@ -159,13 +159,13 @@ public abstract class PulsarContainer<SelfT extends PulsarContainer<SelfT>> exte
}
PulsarContainer another = (PulsarContainer) o;
- return containerName.equals(another.containerName)
+ return getContainerId().equals(another.getContainerId())
&& super.equals(another);
}
@Override
public int hashCode() {
return 31 * super.hashCode() + Objects.hash(
- containerName);
+ getContainerId());
}
}
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/WorkerContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/WorkerContainer.java
index a5091b1..ac37acd 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/WorkerContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/WorkerContainer.java
@@ -41,10 +41,10 @@ public class WorkerContainer extends PulsarContainer<WorkerContainer> {
@Override
protected void beforeStop() {
super.beforeStop();
- if (null != containerId) {
+ if (null != getContainerId()) {
DockerUtils.dumpContainerDirToTargetCompressed(
getDockerClient(),
- containerId,
+ getContainerId(),
"/pulsar/logs/functions"
);
}
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ZKContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ZKContainer.java
index cfdf82d..975ca18 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ZKContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ZKContainer.java
@@ -61,10 +61,10 @@ public class ZKContainer<SelfT extends PulsarContainer<SelfT>> extends PulsarCon
@Override
protected void beforeStop() {
super.beforeStop();
- if (null != containerId && dumpZkDataBeforeStop) {
+ if (null != getContainerId() && dumpZkDataBeforeStop) {
DockerUtils.dumpContainerDirToTargetCompressed(
getDockerClient(),
- containerId,
+ getContainerId(),
"/pulsar/data/zookeeper"
);
}