Skip to content

Commit 3699509

Browse files
michaelsembweveradejanovski
authored andcommitted
Make asserts on schedules existing (having been created) eventual, as this is done by design eventually.
1 parent d85d438 commit 3699509

File tree

1 file changed

+23
-6
lines changed

1 file changed

+23
-6
lines changed

src/server/src/test/java/com/spotify/reaper/acceptance/BasicSteps.java

+23-6
Original file line numberDiff line numberDiff line change
@@ -452,9 +452,18 @@ public void a_second_daily_repair_schedule_is_added_for_and_keyspace(String clus
452452
public void reaper_has_scheduled_repairs_for_cluster_called(int repairAmount, String clusterName) throws Throwable {
453453
synchronized (BasicSteps.class) {
454454
CLIENTS.parallelStream().forEach(client -> {
455-
List<RepairScheduleStatus> schedules = client.getRepairSchedulesForCluster(clusterName);
456-
LOG.info("Got " + schedules.size() + " schedules");
457-
assertEquals(repairAmount, schedules.size());
455+
456+
await().with().pollInterval(1, SECONDS).atMost(1, MINUTES).until(() -> {
457+
try {
458+
List<RepairScheduleStatus> schedules = client.getRepairSchedulesForCluster(clusterName);
459+
LOG.info("Got " + schedules.size() + " schedules");
460+
assertEquals(repairAmount, schedules.size());
461+
} catch (AssertionError ex) {
462+
LOG.warn(ex.getMessage());
463+
return false;
464+
}
465+
return true;
466+
});
458467
});
459468
}
460469
}
@@ -464,9 +473,17 @@ public void reaper_has_scheduled_repairs_for_cluster_called(int repairAmount, St
464473
public void reaper_has_scheduled_repairs_for_the_last_added_cluster(int repairAmount) throws Throwable {
465474
synchronized (BasicSteps.class) {
466475
CLIENTS.parallelStream().forEach(client -> {
467-
List<RepairScheduleStatus> schedules = client.getRepairSchedulesForCluster(TestContext.TEST_CLUSTER);
468-
LOG.info("Got " + schedules.size() + " schedules");
469-
assertEquals(repairAmount, schedules.size());
476+
await().with().pollInterval(1, SECONDS).atMost(1, MINUTES).until(() -> {
477+
try {
478+
List<RepairScheduleStatus> schedules = client.getRepairSchedulesForCluster(TestContext.TEST_CLUSTER);
479+
LOG.info("Got " + schedules.size() + " schedules");
480+
assertEquals(repairAmount, schedules.size());
481+
} catch (AssertionError ex) {
482+
LOG.warn(ex.getMessage());
483+
return false;
484+
}
485+
return true;
486+
});
470487
});
471488
}
472489
}

0 commit comments

Comments
 (0)