Skip to content

Commit 18f22c6

Browse files
frankvickypdruley
authored andcommitted
KAFKA-18677; Update ConsoleConsumerTest system test (apache#18763)
This patch converts the ConsoleConsumerTest system test to only use KRaft. Reviewers: David Jacot <[email protected]>
1 parent 4b4fc85 commit 18f22c6

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

tests/kafkatest/sanity_checks/test_console_consumer.py

+2-9
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
from kafkatest.services.console_consumer import ConsoleConsumer
2424
from kafkatest.services.kafka import KafkaService, quorum
25-
from kafkatest.services.zookeeper import ZookeeperService
2625
from kafkatest.utils.remote_account import line_count, file_exists
2726

2827

@@ -32,20 +31,14 @@ def __init__(self, test_context):
3231
super(ConsoleConsumerTest, self).__init__(test_context)
3332

3433
self.topic = "topic"
35-
self.zk = ZookeeperService(test_context, num_nodes=1) if quorum.for_test(test_context) == quorum.zk else None
36-
self.kafka = KafkaService(self.test_context, num_nodes=1, zk=self.zk, zk_chroot="/kafka",
34+
self.kafka = KafkaService(self.test_context, num_nodes=1, zk=None,
3735
topics={self.topic: {"partitions": 1, "replication-factor": 1}})
3836
self.consumer = ConsoleConsumer(self.test_context, num_nodes=1, kafka=self.kafka, topic=self.topic)
3937

40-
def setUp(self):
41-
if self.zk:
42-
self.zk.start()
43-
4438
@cluster(num_nodes=3)
4539
@matrix(security_protocol=['PLAINTEXT', 'SSL'], metadata_quorum=quorum.all_kraft)
4640
@cluster(num_nodes=4)
47-
@matrix(security_protocol=['SASL_SSL'], sasl_mechanism=['PLAIN'], metadata_quorum=quorum.all_kraft)
48-
@matrix(security_protocol=['SASL_SSL'], sasl_mechanism=['SCRAM-SHA-256', 'SCRAM-SHA-512']) # SCRAM not yet supported with KRaft
41+
@matrix(security_protocol=['SASL_SSL'], sasl_mechanism=['PLAIN', 'SCRAM-SHA-256', 'SCRAM-SHA-512'], metadata_quorum=quorum.all_kraft)
4942
@matrix(security_protocol=['SASL_PLAINTEXT', 'SASL_SSL'], metadata_quorum=quorum.all_kraft)
5043
def test_lifecycle(self, security_protocol, sasl_mechanism='GSSAPI', metadata_quorum=quorum.zk):
5144
"""Check that console consumer starts/stops properly, and that we are capturing log output."""

0 commit comments

Comments
 (0)