Skip to content

Commit ae1a08d

Browse files
apurushotamaapurushotama
authored
Remove/Disable ZK specific tests in Kafka Rest (#1307)
* Remove/Disable ZK specific tests in Kafka Rest * checkstyle * PR comments
1 parent b24054e commit ae1a08d

File tree

5 files changed

+19
-22
lines changed

5 files changed

+19
-22
lines changed

‎kafka-rest/src/test/java/io/confluent/kafkarest/integration/AuthorizationErrorTest.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
package io.confluent.kafkarest.integration;
1717

18-
import static io.confluent.kafkarest.KafkaRestConfig.ZOOKEEPER_CONNECT_CONFIG;
1918
import static io.confluent.kafkarest.TestUtils.TEST_WITH_PARAMETERIZED_QUORUM_NAME;
2019
import static io.confluent.kafkarest.TestUtils.assertErrorResponse;
2120
import static io.confluent.kafkarest.TestUtils.assertOKResponse;
@@ -37,7 +36,6 @@
3736
import java.util.Properties;
3837
import javax.ws.rs.client.Entity;
3938
import javax.ws.rs.core.Response;
40-
import kafka.security.authorizer.AclAuthorizer;
4139
import org.apache.kafka.clients.admin.AdminClientConfig;
4240
import org.apache.kafka.common.acl.AccessControlEntry;
4341
import org.apache.kafka.common.acl.AclBinding;
@@ -50,12 +48,13 @@
5048
import org.apache.kafka.common.serialization.ByteArrayDeserializer;
5149
import org.junit.jupiter.api.AfterEach;
5250
import org.junit.jupiter.api.BeforeEach;
51+
import org.junit.jupiter.api.Disabled;
5352
import org.junit.jupiter.api.TestInfo;
5453
import org.junit.jupiter.params.ParameterizedTest;
5554
import org.junit.jupiter.params.provider.ValueSource;
5655
import scala.Option;
5756

58-
/** This integration test uses AclAuthorizer class which is Zk specific. */
57+
@Disabled("Until we fix KNET-16472, this test should be disabled")
5958
public class AuthorizationErrorTest
6059
extends AbstractProducerTest<BinaryTopicProduceRequest, BinaryPartitionProduceRequest> {
6160

@@ -121,8 +120,6 @@ protected Properties getBrokerProperties(int i) {
121120
(short) 1,
122121
false);
123122
brokerProps.put("broker.id", Integer.toString(i));
124-
brokerProps.put(ZOOKEEPER_CONNECT_CONFIG, zkConnect);
125-
brokerProps.setProperty("authorizer.class.name", AclAuthorizer.class.getName());
126123
brokerProps.setProperty("super.users", "User:admin");
127124
brokerProps.setProperty(
128125
"listener.name.sasl_plaintext.plain.sasl.jaas.config",

‎kafka-rest/src/test/java/io/confluent/kafkarest/integration/SchemaRegistrySaslInheritTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void setUp() throws Exception {
102102
}
103103

104104
@ParameterizedTest(name = TEST_WITH_PARAMETERIZED_QUORUM_NAME)
105-
@ValueSource(strings = {"kraft", "zk"})
105+
@ValueSource(strings = {"kraft"})
106106
public void produceAvroWithRawSchema(String quorum) throws Exception {
107107
String clusterId = kafkaCluster.getClusterId();
108108
String key = "foo";

‎kafka-rest/src/test/java/io/confluent/kafkarest/integration/v3/AclsResourceIntegrationTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ private void createAliceAndBobAcls() {
260260
}
261261

262262
@ParameterizedTest(name = TEST_WITH_PARAMETERIZED_QUORUM_NAME)
263-
@ValueSource(strings = {"kraft", "zk"})
263+
@ValueSource(strings = {"kraft"})
264264
public void testCreateSearchAndSeparateDelete(String quorum) {
265265
createAliceAndBobAcls();
266266

@@ -319,7 +319,7 @@ public void testCreateSearchAndSeparateDelete(String quorum) {
319319
}
320320

321321
@ParameterizedTest(name = TEST_WITH_PARAMETERIZED_QUORUM_NAME)
322-
@ValueSource(strings = {"kraft", "zk"})
322+
@ValueSource(strings = {"kraft"})
323323
public void testCreateSearchAndMultiDelete(String quorum) {
324324
createAliceAndBobAcls();
325325

@@ -358,7 +358,7 @@ public void testCreateSearchAndMultiDelete(String quorum) {
358358
}
359359

360360
@ParameterizedTest(name = TEST_WITH_PARAMETERIZED_QUORUM_NAME)
361-
@ValueSource(strings = {"kraft", "zk"})
361+
@ValueSource(strings = {"kraft"})
362362
public void testMultiDeleteBadQueryParameter(String quorum) {
363363
createAliceAndBobAcls();
364364

@@ -398,7 +398,7 @@ public void testMultiDeleteBadQueryParameter(String quorum) {
398398
}
399399

400400
@ParameterizedTest(name = TEST_WITH_PARAMETERIZED_QUORUM_NAME)
401-
@ValueSource(strings = {"kraft", "zk"})
401+
@ValueSource(strings = {"kraft"})
402402
public void testBatchAclCreate(String quorum) {
403403

404404
SearchAclsResponse expectedPreCreateSearchResponse =
@@ -491,7 +491,7 @@ public void testBatchAclCreate(String quorum) {
491491
}
492492

493493
@ParameterizedTest(name = TEST_WITH_PARAMETERIZED_QUORUM_NAME)
494-
@ValueSource(strings = {"kraft", "zk"})
494+
@ValueSource(strings = {"kraft"})
495495
public void testBatchAclCreateWithNoRequestBody(String quorum) {
496496

497497
Response nullRequestBodyResponse =
@@ -523,7 +523,7 @@ public void testBatchAclCreateWithNoRequestBody(String quorum) {
523523
}
524524

525525
@ParameterizedTest(name = TEST_WITH_PARAMETERIZED_QUORUM_NAME)
526-
@ValueSource(strings = {"kraft", "zk"})
526+
@ValueSource(strings = {"kraft"})
527527
public void testBatchAclCreateRequestWithBodyAndNoContent(String quorum) {
528528

529529
Response emptyRequestBodyResponse =
@@ -555,7 +555,7 @@ public void testBatchAclCreateRequestWithBodyAndNoContent(String quorum) {
555555
}
556556

557557
@ParameterizedTest(name = TEST_WITH_PARAMETERIZED_QUORUM_NAME)
558-
@ValueSource(strings = {"kraft", "zk"})
558+
@ValueSource(strings = {"kraft"})
559559
public void testBatchAclCreateWithBodyAndEmptyData(String quorum) {
560560

561561
List<CreateAclRequest> acls = Arrays.asList();
@@ -593,7 +593,7 @@ public void testBatchAclCreateWithBodyAndEmptyData(String quorum) {
593593
}
594594

595595
@ParameterizedTest(name = TEST_WITH_PARAMETERIZED_QUORUM_NAME)
596-
@ValueSource(strings = {"kraft", "zk"})
596+
@ValueSource(strings = {"kraft"})
597597
public void testBatchAclCreateInvalidEntry(String quorum) {
598598

599599
CreateAclRequest bob =

‎kafka-rest/src/test/java/io/confluent/kafkarest/integration/v3/ProduceActionRateLimitIntegrationTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,15 @@ private void doByteLimitReachedTest() throws Exception {
138138
}
139139

140140
@ParameterizedTest(name = TEST_WITH_PARAMETERIZED_QUORUM_NAME)
141-
@ValueSource(strings = {"kraft", "zk"})
141+
@ValueSource(strings = {"kraft"})
142142
@DisplayName("test_whenGlobalByteLimitReached_thenCallerIsRateLimited")
143143
public void test_whenGlobalByteLimitReached_thenCallerIsRateLimited(String quorum)
144144
throws Exception {
145145
doByteLimitReachedTest();
146146
}
147147

148148
@ParameterizedTest(name = TEST_WITH_PARAMETERIZED_QUORUM_NAME)
149-
@ValueSource(strings = {"kraft", "zk"})
149+
@ValueSource(strings = {"kraft"})
150150
@DisplayName("test_whenClusterByteLimitReached_thenCallerIsRateLimited")
151151
public void test_whenClusterByteLimitReached_thenCallerIsRateLimited(String quorum)
152152
throws Exception {
@@ -200,15 +200,15 @@ private void doCountLimitTest() throws Exception {
200200
}
201201

202202
@ParameterizedTest(name = TEST_WITH_PARAMETERIZED_QUORUM_NAME)
203-
@ValueSource(strings = {"kraft", "zk"})
203+
@ValueSource(strings = {"kraft"})
204204
@DisplayName("test_whenGlobalRequestCountLimitReached_thenCallerIsRateLimited")
205205
public void test_whenGlobalRequestCountLimitReached_thenCallerIsRateLimited(String quorum)
206206
throws Exception {
207207
doCountLimitTest();
208208
}
209209

210210
@ParameterizedTest(name = TEST_WITH_PARAMETERIZED_QUORUM_NAME)
211-
@ValueSource(strings = {"kraft", "zk"})
211+
@ValueSource(strings = {"kraft"})
212212
@DisplayName("test_whenClusterRequestCountLimitReached_thenCallerIsRateLimited")
213213
public void test_whenClusterRequestCountLimitReached_thenCallerIsRateLimited(String quorum)
214214
throws Exception {

‎kafka-rest/src/test/java/io/confluent/kafkarest/integration/v3/ProduceActionRequestSizeLimitIntegrationTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void tearDown() throws Exception {
9999
}
100100

101101
@ParameterizedTest(name = TEST_WITH_PARAMETERIZED_QUORUM_NAME)
102-
@ValueSource(strings = {"kraft", "zk"})
102+
@ValueSource(strings = {"kraft"})
103103
@DisplayName("testStreaming_ProduceRequestSizeNoLimit")
104104
public void testStreaming_ProduceRequestSizeNoLimit(String quorum) throws Exception {
105105
String clusterId = testEnv.kafkaCluster().getClusterId();
@@ -160,7 +160,7 @@ public void testStreaming_ProduceRequestSizeNoLimit(String quorum) throws Except
160160
}
161161

162162
@ParameterizedTest(name = TEST_WITH_PARAMETERIZED_QUORUM_NAME)
163-
@ValueSource(strings = {"kraft", "zk"})
163+
@ValueSource(strings = {"kraft"})
164164
@DisplayName("testStreaming_ProduceRequestSizeWithLimit_withinLimit")
165165
public void testStreaming_ProduceRequestSizeWithLimit_withinLimit(String quorum)
166166
throws Exception {
@@ -223,7 +223,7 @@ public void testStreaming_ProduceRequestSizeWithLimit_withinLimit(String quorum)
223223
}
224224

225225
@ParameterizedTest(name = TEST_WITH_PARAMETERIZED_QUORUM_NAME)
226-
@ValueSource(strings = {"kraft", "zk"})
226+
@ValueSource(strings = {"kraft"})
227227
@DisplayName("testStreaming_ProduceRequestSizeWithLimit_violateLimitFirstMessage")
228228
public void testStreaming_ProduceRequestSizeWithLimit_violateLimitFirstMessage(String quorum)
229229
throws Exception {
@@ -289,7 +289,7 @@ public void testStreaming_ProduceRequestSizeWithLimit_violateLimitFirstMessage(S
289289
}
290290

291291
@ParameterizedTest(name = TEST_WITH_PARAMETERIZED_QUORUM_NAME)
292-
@ValueSource(strings = {"kraft", "zk"})
292+
@ValueSource(strings = {"kraft"})
293293
@DisplayName("testStreaming_ProduceRequestSizeWithLimit_violateLimitSecondMessage")
294294
public void testStreaming_ProduceRequestSizeWithLimit_violateLimitSecondMessage(String quorum)
295295
throws Exception {

0 commit comments

Comments
 (0)