JDK-8257539: tools/jpackage/windows/WinL10nTest.java unpack.bat faile…

…d with Exit code: 1618
openjdk · Dec 9, 2020 · a546f9f · a546f9f
1 parent 5f03341
commit a546f9f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
@@ -63,7 +63,7 @@ private static Path getInstallationSubDirectory(JPackageCommand cmd) {
 
     private static void runMsiexecWithRetries(Executor misexec) {
         Executor.Result result = null;
-        for (int attempt = 0; attempt != 3; ++attempt) {
+        for (int attempt = 0; attempt < 8; ++attempt) {
             result = misexec.executeWithoutExitCodeCheck();
 
             // The given Executor may either be of an msiexe command or an
@@ -72,7 +72,8 @@ private static void runMsiexecWithRetries(Executor misexec) {
             if ((result.exitCode == 1618) || (result.exitCode == 1603)) {
                 // Another installation is already in progress.
                 // Wait a little and try again.
-                ThrowingRunnable.toRunnable(() -> Thread.sleep(3000)).run();
+                Long timeout = 1000L * (attempt + 3); // from 3 to 10 seconds
+                ThrowingRunnable.toRunnable(() -> Thread.sleep(timeout)).run();
                 continue;
             }
             break;