diff --git a/lib/util/devutil.js b/lib/util/devutil.js index b9fdb225..20f204aa 100644 --- a/lib/util/devutil.js +++ b/lib/util/devutil.js @@ -120,7 +120,10 @@ devutil.waitForProcsToDie = function(adb, serial, comm, bin) { return devutil.listPidsByComm(adb, serial, comm, bin) .then(function(pids) { if (pids.length) { - return devutil.waitForProcsToDie(adb, serial, comm, bin) + return Promise.delay(100) + .then(function() { + return devutil.waitForProcsToDie(adb, serial, comm, bin) + }) } }) } @@ -140,8 +143,8 @@ devutil.killProcsByComm = function(adb, serial, comm, bin, mode) { .then(function() { return devutil.waitForProcsToDie(adb, serial, comm, bin) }) - .timeout(1000) - .then(function() { + .timeout(2000) + .catch(function() { return devutil.killProcsByComm(adb, serial, comm, bin, -9) }) })