starred/stf-DeviceFarmer-1
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-18 08:13:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move more work to devutil.

Browse Source
This commit is contained in:
Simo Kinnunen
2014-01-29 14:13:52 +09:00
parent 3c55f91ee9
commit 6c350d0068
2 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/roles/device.js
View File

@@ -90,33 +90,23 @@ module.exports = function(options) {
])
})
.then(function() {
var port = 2870
return adb.openTcpAsync(options.serial, port)
.then(function(conn) {
conn.end()
throw new Error(util.format('Old connection still lives on port %d', port))
})
.catch(function(err) {
if (err.message === 'closed') {
return adb.shellAsync(options.serial, [
vendor.bin.dest
, '--lib', vendor.lib.dest
, '--listen-http', port
])
.then(function(out) {
out.pipe(require('split')())
.on('data', function(chunk) {
log.info('remote: "%s"', chunk)
})
.on('end', function() {
log.fatal('remote: Connection closed')
selfDestruct()
})
})
}
else {
throw err
}
return devutil.ensureUnusedPort(adb, options.serial, 2870)
.then(function(port) {
return adb.shellAsync(options.serial, [
vendor.bin.dest
, '--lib', vendor.lib.dest
, '--listen-http', port
])
.then(function(out) {
out.pipe(require('split')())
.on('data', function(chunk) {
log.info('remote: "%s"', chunk)
})
.on('end', function() {
log.fatal('remote: Connection closed')
selfDestruct()
})
})
})
})
.done(function() {