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

Port to new adbkit.

Browse source
This commit is contained in:
Simo Kinnunen 2014-03-12 12:42:10 +09:00
parent ca401d7b9c
commit d90d450400
4 changed files with 38 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/roles/device.js
View file

@ -65,7 +65,7 @@ module.exports = function(options) {
})
// Adb
var adb = Promise.promisifyAll(adbkit.createClient())
var adb = adbkit.createClient()
// Input
var sub = zmq.socket('sub')
@ -101,13 +101,13 @@ module.exports = function(options) {
selfDestruct()
})
promiseutil.periodicNotify(adb.waitBootCompleteAsync(options.serial), 1000)
promiseutil.periodicNotify(adb.waitBootComplete(options.serial), 1000)
.progressed(function() {
log.info('Waiting for boot to complete')
})
.then(function() {
log.info('Gathering properties')
return adb.getPropertiesAsync(options.serial)
return adb.getProperties(options.serial)
})
.then(function(properties) {
log.info('Solving identity')
@ -118,9 +118,10 @@ module.exports = function(options) {
return Promise.all(Object.keys(vendor).map(function(id) {
var res = vendor[id]
log.info(util.format('Pushing vendor file "%s"', res.dest))
return adb.pushAsync(options.serial, res.src, res.dest, res.mode)
return adb.push(options.serial, res.src, res.dest, res.mode)
.then(function(transfer) {
return new Promise(function(resolve, reject) {
transfer.on('error', reject)
transfer.on('end', resolve)
})
})
@ -148,7 +149,7 @@ module.exports = function(options) {
return devutil.ensureUnusedPort(adb, options.serial, 2870)
.then(function(port) {
var log = logger.createLogger('device:remote:http')
return adb.shellAsync(options.serial, [
return adb.shell(options.serial, [
vendor.bin.dest
, '--lib', vendor.lib.dest
, '--listen-http', port
@ -173,7 +174,7 @@ module.exports = function(options) {
log.info('Opening device HTTP API forwarder on "%s"', url)
return adb.forwardAsync(
return adb.forward(
options.serial
, util.format('tcp:%d', ours)
, util.format('tcp:%d', port)
@ -295,7 +296,7 @@ module.exports = function(options) {
return devutil.ensureUnusedPort(adb, options.serial, 2820)
.then(function(port) {
var log = logger.createLogger('device:remote:touch')
return adb.shellAsync(options.serial, [
return adb.shell(options.serial, [
vendor.bin.dest
, '--lib', vendor.lib.dest
, '--listen-input', port
@ -327,7 +328,7 @@ module.exports = function(options) {
return devutil.ensureUnusedPort(adb, options.serial, 2830)
.then(function(port) {
var log = logger.createLogger('device:remote:stats')
return adb.shellAsync(options.serial, [
return adb.shell(options.serial, [
vendor.bin.dest
, '--lib', vendor.lib.dest
, '--listen-stats', port
@ -343,7 +344,7 @@ module.exports = function(options) {
})
.then(function() {
log.info('Launching logcat service')
return adb.openLogcatAsync(options.serial)
return adb.openLogcat(options.serial)
.then(function(logcat) {
services.logcat = vitals.register('device:logcat', logcat)
resetLogcat()
@ -489,7 +490,7 @@ module.exports = function(options) {
, seq = 0
log.info('Running shell command "%s"', message.command)
adb.shellAsync(options.serial, message.command)
adb.shell(options.serial, message.command)
.then(function(stream) {
var resolver = Promise.defer()
, timer