Merge pull request #32 from matthewlmcclure/increase-emulator-start-t…

…ime-limit Increase emulator startup time limit from 180s to 360s.
jenkinsci · Apr 3, 2014 · 331c2a4 · 331c2a4
2 parents 15852d2 + 587c1c6
commit 331c2a4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/android_emulator/AndroidEmulator.java b/src/main/java/hudson/plugins/android_emulator/AndroidEmulator.java
@@ -60,7 +60,7 @@ public class AndroidEmulator extends BuildWrapper implements Serializable {
     private static final int ADB_CONNECT_TIMEOUT_MS = 60 * 1000;
 
     /** Duration by which emulator booting should normally complete. */
-    private static final int BOOT_COMPLETE_TIMEOUT_MS = 180 * 1000;
+    private static final int BOOT_COMPLETE_TIMEOUT_MS = 360 * 1000;
 
     /** Interval during which killing a process should complete. */
     private static final int KILL_PROCESS_TIMEOUT_MS = 10 * 1000;
@@ -382,7 +382,7 @@ private Environment doSetUp(final AbstractBuild<?, ?> build, final Launcher laun
         log(logger, Messages.WAITING_FOR_BOOT_COMPLETION());
         int bootTimeout = BOOT_COMPLETE_TIMEOUT_MS;
         if (!emulatorAlreadyExists || emuConfig.shouldWipeData() || snapshotState == SnapshotState.INITIALISE) {
-            bootTimeout *= 4;
+            bootTimeout *= 2;
         }
         boolean bootSucceeded = waitForBootCompletion(ignoreProcess, bootTimeout, emu);
         if (!bootSucceeded) {