You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by da...@apache.org on 2022/12/19 19:30:28 UTC
[kafka] branch trunk updated: KAFKA-14529 Use the MetadataVersion from ClusterConfig in ZK tests (#13020)
This is an automated email from the ASF dual-hosted git repository.
davidarthur 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 802fb11d4ea KAFKA-14529 Use the MetadataVersion from ClusterConfig in ZK tests (#13020)
802fb11d4ea is described below
commit 802fb11d4ea276db0d44d591f6e0588192acfef6
Author: David Arthur <mu...@gmail.com>
AuthorDate: Mon Dec 19 14:30:21 2022 -0500
KAFKA-14529 Use the MetadataVersion from ClusterConfig in ZK tests (#13020)
Reviewers: Ismael Juma <is...@juma.me.uk>
---
core/src/test/java/kafka/test/junit/ZkClusterInvocationContext.java | 2 +-
.../integration/kafka/server/KafkaServerKRaftRegistrationTest.scala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/src/test/java/kafka/test/junit/ZkClusterInvocationContext.java b/core/src/test/java/kafka/test/junit/ZkClusterInvocationContext.java
index e77ef4a3ce8..0d9375dbd7c 100644
--- a/core/src/test/java/kafka/test/junit/ZkClusterInvocationContext.java
+++ b/core/src/test/java/kafka/test/junit/ZkClusterInvocationContext.java
@@ -109,7 +109,7 @@ public class ZkClusterInvocationContext implements TestTemplateInvocationContext
@Override
public Properties serverConfig() {
Properties props = clusterConfig.serverProperties();
- props.put(KafkaConfig.InterBrokerProtocolVersionProp(), metadataVersion().version());
+ props.put(KafkaConfig.InterBrokerProtocolVersionProp(), clusterConfig.metadataVersion().version());
return props;
}
diff --git a/core/src/test/scala/integration/kafka/server/KafkaServerKRaftRegistrationTest.scala b/core/src/test/scala/integration/kafka/server/KafkaServerKRaftRegistrationTest.scala
index 8b85a8f81cc..9737a0ea059 100644
--- a/core/src/test/scala/integration/kafka/server/KafkaServerKRaftRegistrationTest.scala
+++ b/core/src/test/scala/integration/kafka/server/KafkaServerKRaftRegistrationTest.scala
@@ -44,7 +44,7 @@ import scala.jdk.CollectionConverters._
class KafkaServerKRaftRegistrationTest {
@ClusterTest(clusterType = Type.ZK, brokers = 3, metadataVersion = MetadataVersion.IBP_3_4_IV0)
- def testRegisterZkBrokerInKraft1(zkCluster: ClusterInstance): Unit = {
+ def testRegisterZkBrokerInKraft(zkCluster: ClusterInstance): Unit = {
val clusterId = zkCluster.clusterId()
// Bootstrap the ZK cluster ID into KRaft