Solved the merge conflict

chiacyu · Apr 15, 2024 · a04e025 · a04e025
1 parent 3855c31
commit a04e025
Showing 1 changed file with 2 additions and 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
@@ -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);