bugfix: fixed flaky tests

shrinkwrap · Sep 26, 2024 · 595f5a1 · 595f5a1
1 parent c426991
commit 595f5a1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/...bedded/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/FileExtractor.java b/...bedded/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/FileExtractor.java
@@ -85,8 +85,9 @@ private void extractFileInDestinationDir() {
       } catch (IOException e) {
          System.err.println("Failed to unzip file: " + e.getMessage());
       }
-      markerFileHandler.deleteMarkerFile();
-      System.out.printf("Resolver: Successfully extracted maven binaries from %s%n", fileToExtract);
+      if (markerFileHandler.deleteMarkerFile()) {
+         System.out.printf("Resolver: Successfully extracted maven binaries from %s%n", fileToExtract);
+      }
    }
 
    private static InputStream getCompressorInputStream(String fileExtension, FileInputStream fileInputStream) throws IOException {

diff --git a/...ed/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/MarkerFileHandler.java b/...ed/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/MarkerFileHandler.java
@@ -23,10 +23,12 @@ void createMarkerFile() {
         }
     }
 
-    void deleteMarkerFile() {
+    boolean deleteMarkerFile() {
         if (markerFile.exists() && !markerFile.delete()) {
             log.warning("failed to delete marker file: " + markerFile);
+            return false;
         }
+        return true;
     }
 
     boolean waitTillMarkerFileIsGone(long timeoutInMilliseconds, String processName) {

diff --git a/...ver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenRunningAsDaemonTestCase.java b/...ver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenRunningAsDaemonTestCase.java
@@ -35,7 +35,7 @@ void testDaemonShouldWaitForBuildSuccess() throws TimeoutException {
             .withWaitUntilOutputLineMatches(".*BUILD SUCCESS.*")
             .build();
 
-        Awaitility.await("Wait till thread is not be alive").atMost(20, TimeUnit.SECONDS)
+        Awaitility.await("Wait till thread is not be alive").atMost(45, TimeUnit.SECONDS)
                 .until(() -> !daemonBuild.isAlive());
 
         Assertions.assertNotNull(daemonBuild.getBuiltProject());
@@ -60,7 +60,7 @@ void testDaemonWithoutWaitShouldNotReachTheEndOfTheBuild() {
         Assertions.assertTrue(daemonBuild.isAlive());
         Assertions.assertNull(daemonBuild.getBuiltProject());
 
-        Awaitility.await("Wait till thread is not be alive").atMost(20, TimeUnit.SECONDS)
+        Awaitility.await("Wait till thread is not be alive").atMost(45, TimeUnit.SECONDS)
                 .until(() -> !daemonBuild.isAlive());
 
         Assertions.assertFalse(daemonBuild.isAlive());