From 5c733e0c8f278a1aee07bb8d13a2d0d93fae45fb Mon Sep 17 00:00:00 2001 From: masokol <97948057+masokol@users.noreply.github.com> Date: Wed, 23 Aug 2023 11:50:29 +0200 Subject: [PATCH] Fix flaky TableRepairJob ITs (#556) --- .../ecchronos/standalone/ITTableRepairJob.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/standalone-integration/src/test/java/com/ericsson/bss/cassandra/ecchronos/standalone/ITTableRepairJob.java b/standalone-integration/src/test/java/com/ericsson/bss/cassandra/ecchronos/standalone/ITTableRepairJob.java index 261f65a38..b580132c9 100644 --- a/standalone-integration/src/test/java/com/ericsson/bss/cassandra/ecchronos/standalone/ITTableRepairJob.java +++ b/standalone-integration/src/test/java/com/ericsson/bss/cassandra/ecchronos/standalone/ITTableRepairJob.java @@ -20,6 +20,8 @@ import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyMap; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.longThat; +import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; @@ -440,10 +442,10 @@ private void verifyTableRepairedSinceWithSubRangeRepair(TableReference tableRefe OptionalLong repairedAt = lastRepairedSince(tableReference, repairedSince, expectedRepaired); assertThat(repairedAt.isPresent()).isTrue(); - verify(mockTableRepairMetrics, timeout(5000)).lastRepairedAt(tableReference, repairedAt.getAsLong()); + verify(mockTableRepairMetrics, timeout(5000)).lastRepairedAt(eq(tableReference), longThat(l -> l >= repairedAt.getAsLong())); int expectedTokenRanges = expectedRepaired.size(); - verify(mockTableRepairMetrics, times(expectedTokenRanges)) + verify(mockTableRepairMetrics, atLeast(expectedTokenRanges)) .repairTiming(eq(tableReference), anyLong(), any(TimeUnit.class), eq(true)); } @@ -453,10 +455,10 @@ private void verifyTableRepairedSince(TableReference tableReference, long repair OptionalLong repairedAt = lastRepairedSince(tableReference, repairedSince); assertThat(repairedAt.isPresent()).isTrue(); - verify(mockTableRepairMetrics, timeout(5000)).lastRepairedAt(tableReference, repairedAt.getAsLong()); + verify(mockTableRepairMetrics, timeout(5000)).lastRepairedAt(eq(tableReference), longThat(l -> l >= repairedAt.getAsLong())); int expectedTokenRanges = expectedRepaired.size(); - verify(mockTableRepairMetrics, times(expectedTokenRanges)) + verify(mockTableRepairMetrics, atLeast(expectedTokenRanges)) .repairTiming(eq(tableReference), anyLong(), any(TimeUnit.class), eq(true)); }