--adb-timeout parameter added

Author: veonua

README.md

@@ -104,6 +104,7 @@ Options:
     --method-name       Test method name to run (must also use --class-name)
     --no-animations     Disable animated gif generation
     --size              Only run test methods annotated by testSize (small, medium, large)
+    --adb-timeout       Set maximum execution time per test in seconds (10min default)
 ```
 
 If you are using Maven for compilation, a plugin is provided for easy execution.

spoon-runner/src/main/java/com/squareup/spoon/SpoonDeviceRunner.java

@@ -38,7 +38,6 @@
 public final class SpoonDeviceRunner {
   private static final String FILE_EXECUTION = "execution.json";
   private static final String FILE_RESULT = "result.json";
-  private static final int ADB_TIMEOUT = 10 * 60 * 1000; //10m
   static final String TEMP_DIR = "work";
   static final String JUNIT_DIR = "junit-reports";
 
@@ -48,6 +47,7 @@ public final class SpoonDeviceRunner {
   private final String serial;
   private final boolean debug;
   private final boolean noAnimations;
+  private final int adbTimeout;
   private final File output;
   private final String className;
   private final String methodName;
@@ -66,21 +66,23 @@ public final class SpoonDeviceRunner {
    * @param output Path to output directory.
    * @param serial Device to run the test on.
    * @param debug Whether or not debug logging is enabled.
+   * @param adbTimeout time in ms for longest test execution
    * @param classpath Custom JVM classpath or {@code null}.
    * @param instrumentationInfo Test apk manifest information.
    * @param className Test class name to run or {@code null} to run all tests.
    * @param methodName Test method name to run or {@code null} to run all tests.  Must also pass
    *        {@code className}.
    */
   SpoonDeviceRunner(File sdk, File apk, File testApk, File output, String serial, boolean debug,
-      boolean noAnimations, String classpath, SpoonInstrumentationInfo instrumentationInfo,
+      boolean noAnimations, int adbTimeout, String classpath, SpoonInstrumentationInfo instrumentationInfo,
       String className, String methodName, IRemoteAndroidTestRunner.TestSize testSize) {
     this.sdk = sdk;
     this.apk = apk;
     this.testApk = testApk;
     this.serial = serial;
     this.debug = debug;
     this.noAnimations = noAnimations;
+    this.adbTimeout = adbTimeout;
     this.output = output;
     this.className = className;
     this.methodName = methodName;
@@ -178,7 +180,7 @@ public DeviceResult run(AndroidDebugBridge adb) {
     try {
       logDebug(debug, "About to actually run tests for [%s]", serial);
       RemoteAndroidTestRunner runner = new RemoteAndroidTestRunner(testPackage, testRunner, device);
-      runner.setMaxtimeToOutputResponse(ADB_TIMEOUT);
+      runner.setMaxtimeToOutputResponse(adbTimeout);
       if (!Strings.isNullOrEmpty(className)) {
         if (Strings.isNullOrEmpty(methodName)) {
           runner.setClassName(className);

spoon-runner/src/main/java/com/squareup/spoon/SpoonRunner.java

@@ -30,6 +30,7 @@
 public final class SpoonRunner {
   private static final String DEFAULT_TITLE = "Spoon Execution";
   public static final String DEFAULT_OUTPUT_DIRECTORY = "spoon-output";
+  private static final int DEFAULT_ADB_TIMEOUT = 10 * 60; //10 minutes
 
   private final String title;
   private final File androidSdk;
@@ -38,14 +39,15 @@ public final class SpoonRunner {
   private final File output;
   private final boolean debug;
   private final boolean noAnimations;
+  private final int adbTimeout;
   private final String className;
   private final String methodName;
   private final Set<String> serials;
   private final String classpath;
   private final IRemoteAndroidTestRunner.TestSize testSize;
 
   private SpoonRunner(String title, File androidSdk, File applicationApk, File instrumentationApk,
-      File output, boolean debug, boolean noAnimations, Set<String> serials, String classpath,
+      File output, boolean debug, boolean noAnimations, int adbTimeout, Set<String> serials, String classpath,
       String className, String methodName, IRemoteAndroidTestRunner.TestSize testSize) {
     this.title = title;
     this.androidSdk = androidSdk;
@@ -54,6 +56,7 @@ private SpoonRunner(String title, File androidSdk, File applicationApk, File ins
     this.output = output;
     this.debug = debug;
     this.noAnimations = noAnimations;
+    this.adbTimeout = adbTimeout;
     this.className = className;
     this.methodName = methodName;
     this.classpath = classpath;
@@ -191,7 +194,7 @@ static boolean parseOverallSuccess(SpoonSummary summary) {
 
   private SpoonDeviceRunner getTestRunner(String serial, SpoonInstrumentationInfo testInfo) {
     return new SpoonDeviceRunner(androidSdk, applicationApk, instrumentationApk, output, serial,
-        debug, noAnimations, classpath, testInfo, className, methodName, testSize);
+        debug, noAnimations, adbTimeout, classpath, testInfo, className, methodName, testSize);
   }
 
   /** Build a test suite for the specified devices and configuration. */
@@ -208,6 +211,7 @@ public static class Builder {
     private String methodName;
     private boolean noAnimations;
     private IRemoteAndroidTestRunner.TestSize testSize;
+    private int adbTimeout;
 
     /** Identifying title for this execution. */
     public Builder setTitle(String title) {
@@ -259,6 +263,12 @@ public Builder setNoAnimations(boolean noAnimations) {
       return this;
     }
 
+    /** Set ADB timeout. */
+    public Builder setAdbTimeout(int value) {
+      this.adbTimeout = value;
+      return this;
+    }
+
     /** Add a device serial for test execution. */
     public Builder addDevice(String serial) {
       checkNotNull(serial, "Serial cannot be null.");
@@ -317,7 +327,7 @@ public SpoonRunner build() {
       }
 
       return new SpoonRunner(title, androidSdk, applicationApk, instrumentationApk, output, debug,
-          noAnimations, serials, classpath, className, methodName, testSize);
+          noAnimations, adbTimeout, serials, classpath, className, methodName, testSize);
     }
   }
 
@@ -357,6 +367,9 @@ static class CommandLineArgs {
     @Parameter(names = { "--no-animations" }, description = "Disable animated gif generation")
     public boolean noAnimations;
 
+    @Parameter(names = { "--adb-timeout" }, description = "Set maximum execution time per test in seconds (10min default)")
+    public int adbTimeoutSeconds = DEFAULT_ADB_TIMEOUT;
+
     @Parameter(names = { "--debug" }, hidden = true)
     public boolean debug;
 
@@ -416,6 +429,7 @@ public static void main(String... args) {
         .setAndroidSdk(parsedArgs.sdk)
         .setNoAnimations(parsedArgs.noAnimations)
         .setTestSize(parsedArgs.size)
+        .setAdbTimeout(parsedArgs.adbTimeoutSeconds * 1000)
         .setClassName(parsedArgs.className)
         .setMethodName(parsedArgs.methodName)
         .useAllAttachedDevices()