8299278: tools/jpackage/share/AddLauncherTest.java#id1 failed AddLauncherTest.bug8230933

Backport-of: c595f965abcf0ea80ace87b8f2180feebbb8984e

Author: GoeLin

test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java

@@ -37,6 +37,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.regex.Pattern;
 import java.util.spi.ToolProvider;
 import java.util.stream.Collectors;
@@ -250,18 +251,49 @@ public List<String> executeAndGetOutput() {
         return saveOutput().execute().getOutput();
     }
 
+    private static class BadResultException extends RuntimeException {
+        BadResultException(Result v) {
+            value = v;
+        }
+
+        Result getValue() {
+            return value;
+        }
+
+        private final Result value;
+    }
+
     /*
      * Repeates command "max" times and waits for "wait" seconds between each
      * execution until command returns expected error code.
      */
     public Result executeAndRepeatUntilExitCode(int expectedCode, int max, int wait) {
-        Result result;
+        try {
+            return tryRunMultipleTimes(() -> {
+                Result result = executeWithoutExitCodeCheck();
+                if (result.getExitCode() != expectedCode) {
+                    throw new BadResultException(result);
+                }
+                return result;
+            }, max, wait).assertExitCodeIs(expectedCode);
+        } catch (BadResultException ex) {
+            return ex.getValue().assertExitCodeIs(expectedCode);
+        }
+    }
+
+    /*
+     * Repeates a "task" "max" times and waits for "wait" seconds between each
+     * execution until the "task" returns without throwing an exception.
+     */
+    public static <T> T tryRunMultipleTimes(Supplier<T> task, int max, int wait) {
+        RuntimeException lastException = null;
         int count = 0;
 
         do {
-            result = executeWithoutExitCodeCheck();
-            if (result.getExitCode() == expectedCode) {
-                return result;
+            try {
+                return task.get();
+            } catch (RuntimeException ex) {
+                lastException = ex;
             }
 
             try {
@@ -273,7 +305,14 @@ public Result executeAndRepeatUntilExitCode(int expectedCode, int max, int wait)
             count++;
         } while (count < max);
 
-        return result.assertExitCodeIs(expectedCode);
+        throw lastException;
+    }
+
+    public static void tryRunMultipleTimes(Runnable task, int max, int wait) {
+        tryRunMultipleTimes(() -> {
+            task.run();
+            return null;
+        }, max, wait);
     }
 
     public List<String> executeWithoutExitCodeCheckAndGetOutput() {

test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherIconVerifier.java

@@ -94,7 +94,9 @@ void verifyLauncherIcon(JPackageCommand cmd, String launcherName,
                 Files.copy(getDefaultAppLauncher(expectedIcon == null
                         && !expectedDefault), iconContainer);
                 if (expectedIcon != null) {
-                    setIcon(expectedIcon, iconContainer);
+                    Executor.tryRunMultipleTimes(() -> {
+                        setIcon(expectedIcon, iconContainer);
+                    }, 3, 5);
                 }
 
                 Path extractedExpectedIcon = extractIconFromExecutable(