MINOR; enable KRaft in ConfigCommandIntegrationTest (#11732)

Adding KRaft and ZK params to ConfigCommandIntegrationTest wherever appropriate.

Reviewers: Kvicii <42023367+Kvicii@users.noreply.github.com>, dengziming <dengziming1993@gmail.com>, José Armando García Sancio <jsancio@users.noreply.github.com>
This commit is contained in:
Alyssa Huang 2022-04-25 15:11:14 -07:00 committed by GitHub
parent a5f7c82a86
commit 2a7fdd7670
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions

View File

@ -20,21 +20,23 @@ import kafka.admin.ConfigCommand.ConfigCommandOptions
import kafka.api.ApiVersion
import kafka.cluster.{Broker, EndPoint}
import kafka.server.{ConfigEntityName, KafkaConfig, QuorumTestHarness}
import kafka.utils.{Exit, Logging}
import kafka.utils.{Exit, Logging, TestInfoUtils}
import kafka.zk.{AdminZkClient, BrokerInfo}
import org.apache.kafka.common.config.ConfigException
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.junit.jupiter.api.Assertions._
import org.junit.jupiter.api.Test
import org.junit.jupiter.params.ParameterizedTest
import org.junit.jupiter.params.provider.ValueSource
import scala.collection.Seq
import scala.jdk.CollectionConverters._
class ConfigCommandIntegrationTest extends QuorumTestHarness with Logging {
@Test
def shouldExitWithNonZeroStatusOnUpdatingUnallowedConfigViaZk(): Unit = {
@ParameterizedTest(name = TestInfoUtils.TestWithParameterizedQuorumName)
@ValueSource(strings = Array("zk"))
def shouldExitWithNonZeroStatusOnUpdatingUnallowedConfigViaZk(quorum: String): Unit = {
assertNonZeroStatusExit(Array(
"--zookeeper", zkConnect,
"--entity-name", "1",
@ -43,8 +45,9 @@ class ConfigCommandIntegrationTest extends QuorumTestHarness with Logging {
"--add-config", "security.inter.broker.protocol=PLAINTEXT"))
}
@Test
def shouldExitWithNonZeroStatusOnZkCommandAlterUserQuota(): Unit = {
@ParameterizedTest(name = TestInfoUtils.TestWithParameterizedQuorumName)
@ValueSource(strings = Array("zk"))
def shouldExitWithNonZeroStatusOnZkCommandAlterUserQuota(quorum: String): Unit = {
assertNonZeroStatusExit(Array(
"--zookeeper", zkConnect,
"--entity-type", "users",
@ -70,8 +73,9 @@ class ConfigCommandIntegrationTest extends QuorumTestHarness with Logging {
assertEquals(Some(1), exitStatus)
}
@Test
def testDynamicBrokerConfigUpdateUsingZooKeeper(): Unit = {
@ParameterizedTest(name = TestInfoUtils.TestWithParameterizedQuorumName)
@ValueSource(strings = Array("zk"))
def testDynamicBrokerConfigUpdateUsingZooKeeper(quorum: String): Unit = {
val brokerId = "1"
val adminZkClient = new AdminZkClient(zkClient)
val alterOpts = Array("--zookeeper", zkConnect, "--entity-type", "brokers", "--alter")