From a04e025250235776f749789829034bf36818f040 Mon Sep 17 00:00:00 2001 From: chiacyu Date: Mon, 15 Apr 2024 15:09:15 +0800 Subject: [PATCH] Solved the merge conflict --- .../java/org/apache/kafka/server/AssignmentsManagerTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java b/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java index 16a6a9a7f5a22..856ba1312fc1d 100644 --- a/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java +++ b/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java @@ -179,7 +179,7 @@ public void testAssignmentAggregation() throws InterruptedException { manager.onAssignment(new TopicIdPartition(TOPIC_1, 3), DIR_3, "testAssignmentAggregation", () -> { }); manager.onAssignment(new TopicIdPartition(TOPIC_1, 4), DIR_1, "testAssignmentAggregation", () -> { }); manager.onAssignment(new TopicIdPartition(TOPIC_2, 5), DIR_2, "testAssignmentAggregation", () -> { }); - while (!readyToAssert.await(1, TimeUnit.MILLISECONDS)) { + TestUtils.waitForCondition(() -> { time.sleep(100); manager.wakeup(); return readyToAssert.await(1, TimeUnit.MILLISECONDS); @@ -250,7 +250,7 @@ void testRequeuesFailedAssignmentPropagations() throws InterruptedException { any(ControllerRequestCompletionHandler.class)); manager.onAssignment(new TopicIdPartition(TOPIC_1, 1), DIR_1, "testRequeuesFailedAssignmentPropagations", () -> { }); - while (!readyToAssert.await(1, TimeUnit.MILLISECONDS)) { + TestUtils.waitForCondition(() -> { time.sleep(TimeUnit.SECONDS.toMillis(1)); manager.wakeup(); return readyToAssert.await(1, TimeUnit.MILLISECONDS);