(kafka) branch 4.0 updated: KAFKA-18677; Update ConsoleConsumerTest system test (#18763)

[dajac]

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

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


The following commit(s) were added to refs/heads/4.0 by this push:
     new 78057eb7f7d KAFKA-18677; Update ConsoleConsumerTest system test 
(#18763)
78057eb7f7d is described below

commit 78057eb7f7d6fe56339a91da7157888ad744f394
Author: TengYao Chi <kiting...@gmail.com>
AuthorDate: Fri Jan 31 19:19:49 2025 +0800

    KAFKA-18677; Update ConsoleConsumerTest system test (#18763)
    
    This patch converts the ConsoleConsumerTest system test to only use KRaft.
    
    Reviewers: David Jacot <dja...@confluent.io>
---
 tests/kafkatest/sanity_checks/test_console_consumer.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/tests/kafkatest/sanity_checks/test_console_consumer.py 
b/tests/kafkatest/sanity_checks/test_console_consumer.py
index 9a271232541..5a4bfee5199 100644
--- a/tests/kafkatest/sanity_checks/test_console_consumer.py
+++ b/tests/kafkatest/sanity_checks/test_console_consumer.py
@@ -22,7 +22,6 @@ from ducktape.utils.util import wait_until
 
 from kafkatest.services.console_consumer import ConsoleConsumer
 from kafkatest.services.kafka import KafkaService, quorum
-from kafkatest.services.zookeeper import ZookeeperService
 from kafkatest.utils.remote_account import line_count, file_exists
 
 
@@ -32,20 +31,14 @@ class ConsoleConsumerTest(Test):
         super(ConsoleConsumerTest, self).__init__(test_context)
 
         self.topic = "topic"
-        self.zk = ZookeeperService(test_context, num_nodes=1) if 
quorum.for_test(test_context) == quorum.zk else None
-        self.kafka = KafkaService(self.test_context, num_nodes=1, zk=self.zk, 
zk_chroot="/kafka",
+        self.kafka = KafkaService(self.test_context, num_nodes=1, zk=None,
                                   topics={self.topic: {"partitions": 1, 
"replication-factor": 1}})
         self.consumer = ConsoleConsumer(self.test_context, num_nodes=1, 
kafka=self.kafka, topic=self.topic)
 
-    def setUp(self):
-        if self.zk:
-            self.zk.start()
-
     @cluster(num_nodes=3)
     @matrix(security_protocol=['PLAINTEXT', 'SSL'], 
metadata_quorum=quorum.all_kraft)
     @cluster(num_nodes=4)
-    @matrix(security_protocol=['SASL_SSL'], sasl_mechanism=['PLAIN'], 
metadata_quorum=quorum.all_kraft)
-    @matrix(security_protocol=['SASL_SSL'], sasl_mechanism=['SCRAM-SHA-256', 
'SCRAM-SHA-512']) # SCRAM not yet supported with KRaft
+    @matrix(security_protocol=['SASL_SSL'], sasl_mechanism=['PLAIN', 
'SCRAM-SHA-256', 'SCRAM-SHA-512'], metadata_quorum=quorum.all_kraft)
     @matrix(security_protocol=['SASL_PLAINTEXT', 'SASL_SSL'], 
metadata_quorum=quorum.all_kraft)
     def test_lifecycle(self, security_protocol, sasl_mechanism='GSSAPI', 
metadata_quorum=quorum.zk):
         """Check that console consumer starts/stops properly, and that we are 
capturing log output."""