From 5592689b6295cd6bafd1a74fc32319d89562ccf9 Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Sat, 27 Jan 2024 16:08:04 +0200 Subject: [PATCH] Add debug log to flaky RolloutManagementFlowTest (#1569) Signed-off-by: Marinov Avgustin --- .../jpa/management/RolloutManagementFlowTest.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/RolloutManagementFlowTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/RolloutManagementFlowTest.java index 22b937624..7c2156c31 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/RolloutManagementFlowTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/RolloutManagementFlowTest.java @@ -78,7 +78,11 @@ class RolloutManagementFlowTest extends AbstractJpaIntegrationTest { .filter(action -> !(targetPrefix + (amountGroups * 3 - 1)).equals(action.getTarget().getControllerId())) .forEach(this::finishAction); rolloutHandler.handleAll(); - assertThat(refresh(groups.get(i)).getStatus()).isEqualTo(i + 1 == amountGroups ? RolloutGroupStatus.RUNNING : RolloutGroupStatus.FINISHED); + final RolloutGroupStatus expectedStatus = + i + 1 == amountGroups ? RolloutGroupStatus.RUNNING : RolloutGroupStatus.FINISHED; + assertThat(refresh(groups.get(i)).getStatus()) + .as("Check that group %s is in status %s", i, expectedStatus) + .isEqualTo(expectedStatus); if (i + 1 != amountGroups) { assertThat(refresh(groups.get(i + 1)).getStatus()).isEqualTo(RolloutGroupStatus.RUNNING); } @@ -141,7 +145,11 @@ class RolloutManagementFlowTest extends AbstractJpaIntegrationTest { .filter(action -> !(targetPrefix + (amountGroups * 3 - 1)).equals(action.getTarget().getControllerId())) .forEach(this::finishAction); rolloutHandler.handleAll(); - assertThat(refresh(groups.get(i)).getStatus()).isEqualTo(i + 1 == amountGroups ? RolloutGroupStatus.RUNNING : RolloutGroupStatus.FINISHED); + final RolloutGroupStatus expectedStatus = + i + 1 == amountGroups ? RolloutGroupStatus.RUNNING : RolloutGroupStatus.FINISHED; + assertThat(refresh(groups.get(i)).getStatus()) + .as("Check that group %s is in status %s", i, expectedStatus) + .isEqualTo(expectedStatus); assertThat(refresh(i + 1 == amountGroups ? dynamic1 : groups.get(i + 1)).getStatus()).isEqualTo(RolloutGroupStatus.RUNNING); // on last round check dynamic }