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

Remove duplicate code.

Browse source
This commit is contained in:
Simo Kinnunen 2015-04-23 09:57:09 +09:00
parent 685882d19f
commit 7202f102d9
1 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/units/device/plugins/screen/stream.js
View file

@ -289,7 +289,7 @@ module.exports = syrup.serial()
}) })
} }
function kindKill() { function kill(signal) {
if (pid <= 0) { if (pid <= 0) {
return Promise.reject(new Error('Minicap service pid is unknown')) return Promise.reject(new Error('Minicap service pid is unknown'))
} }
@ -297,26 +297,19 @@ module.exports = syrup.serial()
log.info('Sending SIGTERM to minicap') log.info('Sending SIGTERM to minicap')
return Promise.all([ return Promise.all([
waitForEnd() waitForEnd()
, adb.shell(options.serial, ['kill', pid]) , adb.shell(options.serial, ['kill', signal, pid])
.then(adbkit.util.readAll) .then(adbkit.util.readAll)
.timeout(2000) .timeout(2000)
.return(true) .return(true)
]) ])
} }
function forceKill() { function kindKill() {
if (pid <= 0) { return kill('-15')
return Promise.reject(new Error('Minicap service pid is unknown')) }
}
log.info('Sending SIGKILL to minicap') function forceKill() {
return Promise.all([ return kill('-9')
waitForEnd()
, adb.shell(options.serial, ['kill', '-9', pid])
.then(adbkit.util.readAll)
.timeout(2000)
.return(true)
])
} }
function forceEnd() { function forceEnd() {