8257539: tools/jpackage/windows/WinL10nTest.java unpack.bat failed with Exit code: 1618
Reviewed-by: almatvee, asemenyuk, prr, kizune
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
index 458fd0d..b0c4b34 100644
--- 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 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 @@
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;
