From 274d0b01fbcaa749f75166b9342c9670e098f326 Mon Sep 17 00:00:00 2001
From: Avgustin Marinov <Avgustin.Marinov@bosch.com>
Date: Tue, 23 Jan 2024 10:17:36 +0200
Subject: [PATCH] Fix flaky actions auto cleanup test (#1561)

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com
---
 .../repository/jpa/autocleanup/AutoActionCleanupTest.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoActionCleanupTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoActionCleanupTest.java
index fde6fe3ede..621d77aa2b 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoActionCleanupTest.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoActionCleanupTest.java
@@ -58,6 +58,7 @@ public void runningActionsAreNotCleanedUp() {
 
         assertThat(actionRepository.count()).isEqualTo(2);
 
+        waitNextMillis();
         autoActionCleanup.run();
 
         assertThat(actionRepository.count()).isEqualTo(2);
@@ -84,6 +85,7 @@ public void cleanupDisabled() {
 
         assertThat(actionRepository.count()).isEqualTo(2);
 
+        waitNextMillis();
         autoActionCleanup.run();
 
         assertThat(actionRepository.count()).isEqualTo(2);
@@ -148,6 +150,7 @@ public void canceledActionsAreCleanedUp() {
 
         assertThat(actionRepository.count()).isEqualTo(3);
 
+        waitNextMillis();
         autoActionCleanup.run();
 
         assertThat(actionRepository.count()).isEqualTo(2);
@@ -180,6 +183,7 @@ public void canceledAndFailedActionsAreCleanedUpWhenExpired() throws Interrupted
         setActionToCanceled(action1);
         setActionToFailed(action2);
 
+        waitNextMillis();
         autoActionCleanup.run();
 
         // actions have not expired yet
@@ -210,5 +214,4 @@ private void setupCleanupConfiguration(final boolean cleanupEnabled, final long
         tenantConfigurationManagement.addOrUpdateConfiguration(ACTION_CLEANUP_ACTION_STATUS,
                 Arrays.stream(status).map(Status::toString).collect(Collectors.joining(",")));
     }
-
 }