(kafka) branch trunk updated: KAFKA-17194 Don't create cluster for MetadataQuorumCommandTest#testCommandConfig (#16682)

[chia7712]

This is an automated email from the ASF dual-hosted git repository.

chia7712 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 4e69bc09e6b KAFKA-17194 Don't create cluster for 
MetadataQuorumCommandTest#testCommandConfig (#16682)
4e69bc09e6b is described below

commit 4e69bc09e6b6f7ebc9985fde2180a9d396e19299
Author: Dmitry Werner <grimekil...@gmail.com>
AuthorDate: Mon Jul 29 15:48:00 2024 +0500

    KAFKA-17194 Don't create cluster for 
MetadataQuorumCommandTest#testCommandConfig (#16682)
    
    Reviewers: TengYao Chi <kiting...@gmail.com>, Chia-Ping Tsai 
<chia7...@gmail.com>
---
 .../kafka/tools/MetadataQuorumCommandTest.java     | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git 
a/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java 
b/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java
index 501b3f1fd3c..29d946ea475 100644
--- a/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java
+++ b/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java
@@ -26,6 +26,7 @@ import org.apache.kafka.clients.admin.AdminClientConfig;
 import org.apache.kafka.common.errors.UnsupportedVersionException;
 import org.apache.kafka.test.TestUtils;
 
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import java.io.File;
@@ -45,11 +46,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 @ExtendWith(value = ClusterTestExtensions.class)
 class MetadataQuorumCommandTest {
 
-    private final ClusterInstance cluster;
-    public MetadataQuorumCommandTest(ClusterInstance cluster) {
-        this.cluster = cluster;
-    }
-
     /**
      * 1. The same number of broker controllers
      * 2. More brokers than controllers
@@ -60,7 +56,7 @@ class MetadataQuorumCommandTest {
         @ClusterTest(types = {Type.KRAFT, Type.CO_KRAFT}, brokers = 2, 
controllers = 1),
         @ClusterTest(types = {Type.KRAFT, Type.CO_KRAFT}, brokers = 1, 
controllers = 2),
     })
-    public void testDescribeQuorumReplicationSuccessful() throws 
InterruptedException {
+    public void testDescribeQuorumReplicationSuccessful(ClusterInstance 
cluster) throws InterruptedException {
         cluster.waitForReadyBrokers();
         String describeOutput = ToolsTestUtils.captureStandardOut(() ->
             MetadataQuorumCommand.mainNoExit("--bootstrap-server", 
cluster.bootstrapServers(), "describe", "--replication")
@@ -87,7 +83,6 @@ class MetadataQuorumCommandTest {
             assertEquals(cluster.config().numBrokers(), 
outputs.stream().filter(o -> observerPattern.matcher(o).find()).count());
     }
 
-
     /**
      * 1. The same number of broker controllers
      * 2. More brokers than controllers
@@ -98,7 +93,7 @@ class MetadataQuorumCommandTest {
         @ClusterTest(types = {Type.KRAFT, Type.CO_KRAFT}, brokers = 2, 
controllers = 1),
         @ClusterTest(types = {Type.KRAFT, Type.CO_KRAFT}, brokers = 1, 
controllers = 2),
     })
-    public void testDescribeQuorumStatusSuccessful() throws 
InterruptedException {
+    public void testDescribeQuorumStatusSuccessful(ClusterInstance cluster) 
throws InterruptedException {
         cluster.waitForReadyBrokers();
         String describeOutput = ToolsTestUtils.captureStandardOut(
             () -> MetadataQuorumCommand.mainNoExit(
@@ -134,7 +129,7 @@ class MetadataQuorumCommandTest {
     }
 
     @ClusterTest(types = {Type.KRAFT, Type.CO_KRAFT})
-    public void testOnlyOneBrokerAndOneController() {
+    public void testOnlyOneBrokerAndOneController(ClusterInstance cluster) {
         String statusOutput = ToolsTestUtils.captureStandardOut(() ->
             MetadataQuorumCommand.mainNoExit("--bootstrap-server", 
cluster.bootstrapServers(), "describe", "--status")
         );
@@ -147,16 +142,16 @@ class MetadataQuorumCommandTest {
         assertEquals("0", replicationOutput.split("\n")[1].split("\\s+")[2]);
     }
 
-    @ClusterTest(types = {Type.CO_KRAFT})
+    @Test
     public void testCommandConfig() throws IOException {
         // specifying a --command-config containing properties that would 
prevent login must fail
         File tmpfile = 
TestUtils.tempFile(AdminClientConfig.SECURITY_PROTOCOL_CONFIG + 
"=SSL_PLAINTEXT");
-        assertEquals(1, MetadataQuorumCommand.mainNoExit("--bootstrap-server", 
cluster.bootstrapServers(),
+        assertEquals(1, MetadataQuorumCommand.mainNoExit("--bootstrap-server", 
"localhost:9092",
                         "--command-config", tmpfile.getAbsolutePath(), 
"describe", "--status"));
     }
 
     @ClusterTest(types = {Type.ZK})
-    public void testDescribeQuorumInZkMode() {
+    public void testDescribeQuorumInZkMode(ClusterInstance cluster) {
         assertInstanceOf(UnsupportedVersionException.class, assertThrows(
                 ExecutionException.class,
                 () -> MetadataQuorumCommand.execute("--bootstrap-server", 
cluster.bootstrapServers(), "describe", "--status")
@@ -166,11 +161,10 @@ class MetadataQuorumCommandTest {
                 ExecutionException.class,
                 () -> MetadataQuorumCommand.execute("--bootstrap-server", 
cluster.bootstrapServers(), "describe", "--replication")
         ).getCause());
-
     }
 
     @ClusterTest(types = {Type.CO_KRAFT})
-    public void testHumanReadableOutput() {
+    public void testHumanReadableOutput(ClusterInstance cluster) {
         assertEquals(1, MetadataQuorumCommand.mainNoExit("--bootstrap-server", 
cluster.bootstrapServers(), "describe", "--human-readable"));
         assertEquals(1, MetadataQuorumCommand.mainNoExit("--bootstrap-server", 
cluster.bootstrapServers(), "describe", "--status", "--human-readable"));
         String out0 = ToolsTestUtils.captureStandardOut(() ->