splett2 commented on a change in pull request #9628:
URL: https://github.com/apache/kafka/pull/9628#discussion_r536241597
##########
File path: core/src/test/scala/unit/kafka/server/ClientQuotasRequestTest.scala
##########
@@ -236,13 +310,22 @@ class ClientQuotasRequestTest extends BaseRequestTest {
(Some("user-3"), None, 58.58),
(Some(null), None, 59.59),
(None, Some("client-id-2"), 60.60)
- ).map { case (u, c, v) => (toEntity(u, c), v) }
+ ).map { case (u, c, v) => (toClientEntity(u, c), v) }
+
+ private val matchIpEntities = List(
+ (Some("1.2.3.4"), 10.0),
+ (Some("2.3.4.5"), 20.0)
+ ).map { case (ip, quota) => (toIpEntity(ip), quota)}
private def setupDescribeClientQuotasMatchTest() = {
- val result = alterClientQuotas(matchEntities.map { case (e, v) =>
- (e -> Map((RequestPercentageProp, Some(v))))
- }.toMap, validateOnly = false)
- matchEntities.foreach(e => result.get(e._1).get.get(10, TimeUnit.SECONDS))
+ val userClientQuotas = matchUserClientEntities.map { case (e, v) =>
+ e -> Map((RequestPercentageProp, Some(v)))
+ }.toMap
+ val ipQuotas = matchIpEntities.map { case (e, v) =>
+ e -> Map((IpConnectionRateProp, Some(v)))
+ }.toMap
+ val result = alterClientQuotas(userClientQuotas ++ ipQuotas, validateOnly
= false)
+ (matchUserClientEntities ++ matchIpEntities).foreach(e =>
result(e._1).get(10, TimeUnit.SECONDS))
// Allow time for watch callbacks to be triggered.
Thread.sleep(500)
Review comment:
makes sense, will do.
Actually, taking a closer look, there is no need for the `Thread.sleep()`
call. None of the tests that use the match setup rely on ZK watches to trigger.
I'll just remove the call to `Thread.sleep()` instead.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
