You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by ni...@apache.org on 2022/06/22 13:17:52 UTC
[pulsar] branch master updated: [improve][test] Upgrade testcontainers to 1.17.2 (#16161)
This is an automated email from the ASF dual-hosted git repository.
nicoloboschi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new c8f03e8f532 [improve][test] Upgrade testcontainers to 1.17.2 (#16161)
c8f03e8f532 is described below
commit c8f03e8f532a54ca9d7f180b9046ea47e29b0178
Author: Nicolò Boschi <bo...@gmail.com>
AuthorDate: Wed Jun 22 15:17:43 2022 +0200
[improve][test] Upgrade testcontainers to 1.17.2 (#16161)
* [improve][test] Upgrade testcontainers to 1.17.2
* migrate getContainerIpAddress to getHost
* fix compile
* remove usage of shaded lib from testcontainers
---
pom.xml | 4 ++--
.../java/org/apache/pulsar/tests/integration/PulsarContainer.java | 2 +-
.../java/org/apache/pulsar/tests/integration/PulsarContainer.java | 2 +-
.../java/org/apache/pulsar/tests/integration/PulsarContainer.java | 2 +-
.../pulsar/tests/integration/cli/FileSystemPackagesCliTest.java | 2 +-
.../org/apache/pulsar/tests/integration/cli/PackagesCliTest.java | 2 +-
.../org/apache/pulsar/tests/integration/cli/PulsarVersionTest.java | 2 +-
.../pulsar/tests/integration/containers/PrestoWorkerContainer.java | 2 +-
.../apache/pulsar/tests/integration/containers/ProxyContainer.java | 4 ++--
.../pulsar/tests/integration/containers/StandaloneContainer.java | 4 ++--
.../org/apache/pulsar/tests/integration/io/RabbitMQSinkTester.java | 2 +-
.../tests/integration/presto/TestPrestoQueryTieredStorage.java | 2 +-
.../apache/pulsar/tests/integration/presto/TestPulsarSQLBase.java | 6 +++---
.../apache/pulsar/tests/integration/topologies/PulsarCluster.java | 6 +++---
.../java/org/apache/pulsar/tests/integration/PulsarContainer.java | 4 ++--
.../java/org/apache/pulsar/tests/integration/PulsarContainer.java | 4 ++--
.../java/org/apache/pulsar/tests/integration/PulsarContainer.java | 4 ++--
17 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index c9c4b88980a..02f3301136b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -228,11 +228,11 @@ flexible messaging model and an intuitive client API.</description>
<netty-reactive-streams.version>2.0.6</netty-reactive-streams.version>
<!-- test dependencies -->
- <testcontainers.version>1.15.3</testcontainers.version>
+ <testcontainers.version>1.17.2</testcontainers.version>
<hamcrest.version>2.2</hamcrest.version>
<!-- Set docker-java.version to the version of docker-java used in Testcontainers -->
- <docker-java.version>3.2.8</docker-java.version>
+ <docker-java.version>3.2.13</docker-java.version>
<kerby.version>1.1.1</kerby.version>
<testng.version>7.3.0</testng.version>
<mockito.version>3.12.4</mockito.version>
diff --git a/tests/bc_2_0_0/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java b/tests/bc_2_0_0/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
index 446074c0d77..349c3f1daa5 100644
--- a/tests/bc_2_0_0/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
+++ b/tests/bc_2_0_0/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
@@ -48,7 +48,7 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> {
}
public String getPlainTextPulsarBrokerUrl() {
- return String.format("pulsar://%s:%s", this.getContainerIpAddress(), this.getMappedPort(PULSAR_PORT));
+ return String.format("pulsar://%s:%s", this.getHost(), this.getMappedPort(PULSAR_PORT));
}
}
diff --git a/tests/bc_2_0_1/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java b/tests/bc_2_0_1/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
index 446074c0d77..349c3f1daa5 100644
--- a/tests/bc_2_0_1/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
+++ b/tests/bc_2_0_1/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
@@ -48,7 +48,7 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> {
}
public String getPlainTextPulsarBrokerUrl() {
- return String.format("pulsar://%s:%s", this.getContainerIpAddress(), this.getMappedPort(PULSAR_PORT));
+ return String.format("pulsar://%s:%s", this.getHost(), this.getMappedPort(PULSAR_PORT));
}
}
diff --git a/tests/bc_2_6_0/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java b/tests/bc_2_6_0/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
index 446074c0d77..349c3f1daa5 100644
--- a/tests/bc_2_6_0/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
+++ b/tests/bc_2_6_0/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
@@ -48,7 +48,7 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> {
}
public String getPlainTextPulsarBrokerUrl() {
- return String.format("pulsar://%s:%s", this.getContainerIpAddress(), this.getMappedPort(PULSAR_PORT));
+ return String.format("pulsar://%s:%s", this.getHost(), this.getMappedPort(PULSAR_PORT));
}
}
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/FileSystemPackagesCliTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/FileSystemPackagesCliTest.java
index a9aa38cc9eb..08f5e50a2d9 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/FileSystemPackagesCliTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/FileSystemPackagesCliTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.pulsar.tests.integration.cli;
+import org.apache.commons.lang3.RandomStringUtils;
import org.apache.pulsar.tests.TestRetrySupport;
import org.apache.pulsar.tests.integration.containers.BrokerContainer;
import org.apache.pulsar.tests.integration.docker.ContainerExecResult;
import org.apache.pulsar.tests.integration.topologies.PulsarCluster;
import org.apache.pulsar.tests.integration.topologies.PulsarClusterSpec;
-import org.testcontainers.shaded.org.apache.commons.lang.RandomStringUtils;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PackagesCliTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PackagesCliTest.java
index f6e5db7a6c1..2ed201d6c2f 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PackagesCliTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PackagesCliTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.pulsar.tests.integration.cli;
+import org.apache.commons.lang3.RandomStringUtils;
import org.apache.pulsar.tests.TestRetrySupport;
import org.apache.pulsar.tests.integration.containers.BrokerContainer;
import org.apache.pulsar.tests.integration.docker.ContainerExecResult;
import org.apache.pulsar.tests.integration.topologies.PulsarCluster;
import org.apache.pulsar.tests.integration.topologies.PulsarClusterSpec;
-import org.testcontainers.shaded.org.apache.commons.lang.RandomStringUtils;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PulsarVersionTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PulsarVersionTest.java
index 0d7d4f3e073..c5a785e3e7f 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PulsarVersionTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PulsarVersionTest.java
@@ -18,11 +18,11 @@
*/
package org.apache.pulsar.tests.integration.cli;
+import org.apache.commons.lang3.RandomStringUtils;
import org.apache.pulsar.tests.TestRetrySupport;
import org.apache.pulsar.tests.integration.docker.ContainerExecResult;
import org.apache.pulsar.tests.integration.topologies.PulsarCluster;
import org.apache.pulsar.tests.integration.topologies.PulsarClusterSpec;
-import org.testcontainers.shaded.org.apache.commons.lang.RandomStringUtils;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
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 0105cd83926..2bb696580f0 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
@@ -63,6 +63,6 @@ public class PrestoWorkerContainer extends PulsarContainer<PrestoWorkerContainer
}
public String getUrl() {
- return String.format("%s:%s", getContainerIpAddress(), getMappedPort(PrestoWorkerContainer.PRESTO_HTTP_PORT));
+ return String.format("%s:%s", getHost(), getMappedPort(PrestoWorkerContainer.PRESTO_HTTP_PORT));
}
}
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ProxyContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ProxyContainer.java
index 3d97c9e9220..617a6692756 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ProxyContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ProxyContainer.java
@@ -33,11 +33,11 @@ public class ProxyContainer extends PulsarContainer<ProxyContainer> {
}
public String getPlainTextServiceUrl() {
- return "pulsar://" + getContainerIpAddress() + ":" + getMappedPort(BROKER_PORT);
+ return "pulsar://" + getHost() + ":" + getMappedPort(BROKER_PORT);
}
public String getHttpServiceUrl() {
- return "http://" + getContainerIpAddress() + ":" + getMappedPort(BROKER_HTTP_PORT);
+ return "http://" + getHost() + ":" + getMappedPort(BROKER_HTTP_PORT);
}
@Override
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/StandaloneContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/StandaloneContainer.java
index 819e3286a83..0bdea9cb45f 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/StandaloneContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/StandaloneContainer.java
@@ -68,10 +68,10 @@ public class StandaloneContainer extends PulsarContainer<StandaloneContainer> {
}
public String getPlainTextServiceUrl() {
- return "pulsar://" + getContainerIpAddress() + ":" + getMappedPort(BROKER_PORT);
+ return "pulsar://" + getHost() + ":" + getMappedPort(BROKER_PORT);
}
public String getHttpServiceUrl() {
- return "http://" + getContainerIpAddress() + ":" + getMappedPort(BROKER_HTTP_PORT);
+ return "http://" + getHost() + ":" + getMappedPort(BROKER_HTTP_PORT);
}
}
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/RabbitMQSinkTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/RabbitMQSinkTester.java
index f186360b950..3ef9ace9510 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/RabbitMQSinkTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/RabbitMQSinkTester.java
@@ -66,7 +66,7 @@ public class RabbitMQSinkTester extends SinkTester<RabbitMQContainer> {
static ConnectionFactory createConnectionFactory(RabbitMQContainer container) {
ConnectionFactory connectionFactory = new ConnectionFactory();
- connectionFactory.setHost(container.getContainerIpAddress());
+ connectionFactory.setHost(container.getHost());
connectionFactory.setPort(container.getMappedPort(RabbitMQContainer.PORTS[0]));
return connectionFactory;
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestPrestoQueryTieredStorage.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestPrestoQueryTieredStorage.java
index 5ca4ae41c57..537bc90d47c 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestPrestoQueryTieredStorage.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestPrestoQueryTieredStorage.java
@@ -25,6 +25,7 @@ import lombok.Cleanup;
import lombok.extern.slf4j.Slf4j;
import org.apache.bookkeeper.client.BookKeeper;
import org.apache.bookkeeper.conf.ClientConfiguration;
+import org.apache.commons.lang3.StringUtils;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.api.CompressionType;
import org.apache.pulsar.client.api.Consumer;
@@ -37,7 +38,6 @@ import org.apache.pulsar.common.naming.NamespaceName;
import org.apache.pulsar.common.naming.TopicDomain;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.tests.integration.containers.S3Container;
-import org.testcontainers.shaded.org.apache.commons.lang.StringUtils;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestPulsarSQLBase.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestPulsarSQLBase.java
index 74d373ccc45..c1d63fa3c0b 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestPulsarSQLBase.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestPulsarSQLBase.java
@@ -31,6 +31,9 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
import org.apache.pulsar.client.api.CompressionType;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.common.naming.TopicName;
@@ -40,9 +43,6 @@ import org.apache.pulsar.tests.integration.docker.ContainerExecResult;
import org.apache.pulsar.tests.integration.suites.PulsarSQLTestSuite;
import org.apache.pulsar.tests.integration.topologies.PulsarCluster;
import org.awaitility.Awaitility;
-import org.testcontainers.shaded.okhttp3.OkHttpClient;
-import org.testcontainers.shaded.okhttp3.Request;
-import org.testcontainers.shaded.okhttp3.Response;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java
index 433607c3ee2..361ecbd5eb9 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java
@@ -214,7 +214,7 @@ public class PulsarCluster {
Iterator<BrokerContainer> brokers = getBrokers().iterator();
while (brokers.hasNext()) {
BrokerContainer broker = brokers.next();
- multiUrl += broker.getContainerIpAddress() + ":" + broker.getMappedPort(BROKER_HTTP_PORT);
+ multiUrl += broker.getHost() + ":" + broker.getMappedPort(BROKER_HTTP_PORT);
if (brokers.hasNext()) {
multiUrl += ",";
}
@@ -223,11 +223,11 @@ public class PulsarCluster {
}
public String getZKConnString() {
- return zkContainer.getContainerIpAddress() + ":" + zkContainer.getMappedPort(ZK_PORT);
+ return zkContainer.getHost() + ":" + zkContainer.getMappedPort(ZK_PORT);
}
public String getCSConnString() {
- return csContainer.getContainerIpAddress() + ":" + csContainer.getMappedPort(CS_PORT);
+ return csContainer.getHost() + ":" + csContainer.getMappedPort(CS_PORT);
}
public Network getNetwork() {
diff --git a/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java b/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
index f742a704c1b..4220415ba61 100644
--- a/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
+++ b/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
@@ -48,11 +48,11 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> {
}
public String getPlainTextPulsarBrokerUrl() {
- return String.format("pulsar://%s:%s", this.getContainerIpAddress(), this.getMappedPort(PULSAR_PORT));
+ return String.format("pulsar://%s:%s", this.getHost(), this.getMappedPort(PULSAR_PORT));
}
public String getPulsarAdminUrl() {
- return String.format("http://%s:%s", this.getContainerIpAddress(), this.getMappedPort(BROKER_HTTP_PORT));
+ return String.format("http://%s:%s", this.getHost(), this.getMappedPort(BROKER_HTTP_PORT));
}
}
diff --git a/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java b/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
index f742a704c1b..4220415ba61 100644
--- a/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
+++ b/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
@@ -48,11 +48,11 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> {
}
public String getPlainTextPulsarBrokerUrl() {
- return String.format("pulsar://%s:%s", this.getContainerIpAddress(), this.getMappedPort(PULSAR_PORT));
+ return String.format("pulsar://%s:%s", this.getHost(), this.getMappedPort(PULSAR_PORT));
}
public String getPulsarAdminUrl() {
- return String.format("http://%s:%s", this.getContainerIpAddress(), this.getMappedPort(BROKER_HTTP_PORT));
+ return String.format("http://%s:%s", this.getHost(), this.getMappedPort(BROKER_HTTP_PORT));
}
}
diff --git a/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java b/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
index f742a704c1b..4220415ba61 100644
--- a/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
+++ b/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
@@ -48,11 +48,11 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> {
}
public String getPlainTextPulsarBrokerUrl() {
- return String.format("pulsar://%s:%s", this.getContainerIpAddress(), this.getMappedPort(PULSAR_PORT));
+ return String.format("pulsar://%s:%s", this.getHost(), this.getMappedPort(PULSAR_PORT));
}
public String getPulsarAdminUrl() {
- return String.format("http://%s:%s", this.getContainerIpAddress(), this.getMappedPort(BROKER_HTTP_PORT));
+ return String.format("http://%s:%s", this.getHost(), this.getMappedPort(BROKER_HTTP_PORT));
}
}