Promise.timeout() doesn't stack (i.e. foo.timeout(1000).timeout(1000) doesn't mean "wait 1000ms, then another 1000ms", it means that we have two 1000ms timeouts running at the same time). Fix places where it could be a problem.

lib/roles/device/resources/service.js

@@ -72,11 +72,13 @@ module.exports = syrup.serial()
           // Uninstall first to make sure we don't have any certificate
           // issues.
           return adb.uninstall(options.serial, resource.pkg)
+            .timeout(15000)
             .then(function() {
               return promiseutil.periodicNotify(
-                adb.install(options.serial, resource.apk)
-              , 10000
-              )
+                  adb.install(options.serial, resource.apk)
+                , 10000
+                )
+                .timeout(60000)
             })
             .progressed(function() {
               log.warn(
@@ -85,7 +87,6 @@ module.exports = syrup.serial()
               + 'on the device?'
               )
             })
-            .timeout(60000)
             .then(function() {
               return getPath()
             })