[kafka] branch 2.8 updated: MINOR: fix client_compatibility_features_test.py (#10292)

[cm...@apache.org]

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

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


The following commit(s) were added to refs/heads/2.8 by this push:
     new 5d04349  MINOR: fix client_compatibility_features_test.py (#10292)
5d04349 is described below

commit 5d0434900befe1563ddf344431e22f75caa1de5d
Author: Chia-Ping Tsai <ch...@gmail.com>
AuthorDate: Thu Mar 18 01:27:06 2021 +0800

    MINOR: fix client_compatibility_features_test.py (#10292)
    
    Reviewers: Colin Patrick McCabe <cm...@confluent.io>, Ron Dagostino <rd...@confluent.io>
---
 .../kafkatest/tests/client/client_compatibility_features_test.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/kafkatest/tests/client/client_compatibility_features_test.py b/tests/kafkatest/tests/client/client_compatibility_features_test.py
index d98dffa..e04c65e 100644
--- a/tests/kafkatest/tests/client/client_compatibility_features_test.py
+++ b/tests/kafkatest/tests/client/client_compatibility_features_test.py
@@ -79,6 +79,9 @@ class ClientCompatibilityFeaturesTest(Test):
             "replication-factor": 3
             }}
         self.kafka = KafkaService(test_context, num_nodes=3, zk=self.zk, topics=self.topics)
+        # Always use the latest version of org.apache.kafka.tools.ClientCompatibilityTest
+        # so store away the path to the DEV version before we set the Kafka version
+        self.dev_script_path = self.kafka.path.script("kafka-run-class.sh", self.kafka.nodes[0])
 
     def invoke_compatibility_program(self, features):
         # Run the compatibility test on the first Kafka node.
@@ -86,7 +89,7 @@ class ClientCompatibilityFeaturesTest(Test):
         cmd = ("%s org.apache.kafka.tools.ClientCompatibilityTest "
                "--bootstrap-server %s "
                "--num-cluster-nodes %d "
-               "--topic %s " % (self.kafka.path.script("kafka-run-class.sh", node),
+               "--topic %s " % (self.dev_script_path,
                                self.kafka.bootstrap_servers(),
                                len(self.kafka.nodes),
                                list(self.topics.keys())[0]))
@@ -130,4 +133,8 @@ class ClientCompatibilityFeaturesTest(Test):
         self.kafka.set_version(KafkaVersion(broker_version))
         self.kafka.start()
         features = get_broker_features(broker_version)
+        if not self.zk:
+            #  this check/disabling is only necessary due to the fact that we are in early access mode with
+            #  KIP-500 and we should remove the special casing when that his fully implemented
+            features["describe-acls-supported"] = False
         self.invoke_compatibility_program(features)