This is an automated email from the ASF dual-hosted git repository. mapohl pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit dbd07d38839367e1ef46ad0de44bf91b44933dce Author: Matthias Pohl <[email protected]> AuthorDate: Wed Apr 12 11:17:13 2023 +0200 [hotfix][tests] Replaces TestingZooKeeperServer with ZooKeeperExtension Signed-off-by: Matthias Pohl <[email protected]> --- .../ZooKeeperLeaderRetrievalTest.java | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalTest.java index 78f159cb364..533081cfca4 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalTest.java @@ -20,6 +20,7 @@ package org.apache.flink.runtime.leaderretrieval; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.HighAvailabilityOptions; +import org.apache.flink.core.testutils.EachCallbackWrapper; import org.apache.flink.runtime.blob.VoidBlobStore; import org.apache.flink.runtime.highavailability.HighAvailabilityServices; import org.apache.flink.runtime.highavailability.zookeeper.ZooKeeperMultipleComponentLeaderElectionHaServices; @@ -28,14 +29,13 @@ import org.apache.flink.runtime.leaderelection.LeaderElectionService; import org.apache.flink.runtime.leaderelection.TestingContender; import org.apache.flink.runtime.rpc.AddressResolution; import org.apache.flink.runtime.rpc.RpcSystem; -import org.apache.flink.runtime.testutils.ZooKeeperTestUtils; import org.apache.flink.runtime.util.LeaderRetrievalUtils; import org.apache.flink.runtime.util.TestingFatalErrorHandlerExtension; import org.apache.flink.runtime.util.ZooKeeperUtils; +import org.apache.flink.runtime.zookeeper.ZooKeeperExtension; import org.apache.flink.testutils.TestingUtils; import org.apache.flink.testutils.executor.TestExecutorExtension; -import org.apache.curator.test.TestingServer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -62,24 +62,26 @@ class ZooKeeperLeaderRetrievalTest { private static final TestExecutorExtension<ScheduledExecutorService> EXECUTOR_RESOURCE = TestingUtils.defaultExecutorExtension(); + private final ZooKeeperExtension zooKeeperExtension = new ZooKeeperExtension(); + + @RegisterExtension + private final EachCallbackWrapper<ZooKeeperExtension> eachWrapper = + new EachCallbackWrapper<>(zooKeeperExtension); + @RegisterExtension private final TestingFatalErrorHandlerExtension testingFatalErrorHandlerResource = new TestingFatalErrorHandlerExtension(); - private TestingServer testingServer; - private Configuration config; private HighAvailabilityServices highAvailabilityServices; @BeforeEach void before() throws Exception { - testingServer = ZooKeeperTestUtils.createAndStartZookeeperTestingServer(); - config = new Configuration(); config.setString(HighAvailabilityOptions.HA_MODE, "zookeeper"); config.setString( - HighAvailabilityOptions.HA_ZOOKEEPER_QUORUM, testingServer.getConnectString()); + HighAvailabilityOptions.HA_ZOOKEEPER_QUORUM, zooKeeperExtension.getConnectString()); highAvailabilityServices = new ZooKeeperMultipleComponentLeaderElectionHaServices( @@ -99,12 +101,6 @@ class ZooKeeperLeaderRetrievalTest { highAvailabilityServices = null; } - - if (testingServer != null) { - testingServer.close(); - - testingServer = null; - } } /**
