yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-04 02:09:32 +02:00
Code Issues Releases Wiki Activity

Figure out how to kill monkey reliably.

Browse source
This commit is contained in:
Simo Kinnunen 2014-01-29 12:19:48 +09:00
parent 403c29c60a
commit 3c55f91ee9
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/roles/device.js
View file

@ -74,7 +74,20 @@ module.exports = function(options) {
}) })
.then(function() { .then(function() {
log.info('Checking if any processes from a previous run are still up') log.info('Checking if any processes from a previous run are still up')
return devutil.killProcsByBin(adb, options.serial, vendor.bin.dest) return Promise.all([
devutil.killProcsByComm(
adb
, options.serial
, vendor.bin.comm
, vendor.bin.dest
)
, devutil.killProcsByComm(
adb
, options.serial
, 'commands.monkey'
, 'com.android.commands.monkey'
)
])
}) })
.then(function() { .then(function() {
var port = 2870 var port = 2870

7
lib/util/devutil.js
View file

@ -1,5 +1,4 @@
var util = require('util') var util = require('util')
var path = require('path')
var split = require('split') var split = require('split')
var Promise = require('bluebird') var Promise = require('bluebird')
@ -15,6 +14,7 @@ devutil.vendorFiles = function(identity) {
src: pathutil.vendor(util.format( src: pathutil.vendor(util.format(
'remote/libs/%s/remote', identity.abi)) 'remote/libs/%s/remote', identity.abi))
, dest: '/data/local/tmp/remote' , dest: '/data/local/tmp/remote'
, comm: 'remote'
, mode: 0755 , mode: 0755
} }
, lib: { , lib: {
@ -26,9 +26,8 @@ devutil.vendorFiles = function(identity) {
} }
} }
devutil.killProcsByBin = function(adb, serial, bin) { devutil.killProcsByComm = function(adb, serial, comm, bin) {
var basename = path.basename(bin) return adb.shellAsync(serial, ['ps', comm])
return adb.shellAsync(serial, ['ps', basename])
.then(function(out) { .then(function(out) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
var header = false var header = false