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

Initiate monkey directly from stream. On some devices monkey crashes if we just connect and disconnect.

Browse source
This commit is contained in:
Simo Kinnunen 2014-01-30 10:49:54 +09:00
parent 01070bcf6c
commit 8db22952bf
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/roles/device.js
View file

@ -4,6 +4,7 @@ var util = require('util')
var Promise = require('bluebird') var Promise = require('bluebird')
var zmq = require('zmq') var zmq = require('zmq')
var adbkit = require('adbkit') var adbkit = require('adbkit')
var monkey = require('adbkit-monkey')
var logger = require('../util/logger') var logger = require('../util/logger')
var wire = require('../wire') var wire = require('../wire')
@ -173,8 +174,8 @@ module.exports = function(options) {
.then(function(port) { .then(function(port) {
return devutil.waitForPort(adb, options.serial, port) return devutil.waitForPort(adb, options.serial, port)
}) })
.then(function(port) { .then(function(conn) {
return adb.openMonkeyAsync(options.serial, port) return monkey.connectStream(conn)
}) })
.then(function(monkey) { .then(function(monkey) {
services.monkey = services.monkey =
@ -203,8 +204,8 @@ module.exports = function(options) {
.then(function(port) { .then(function(port) {
return devutil.waitForPort(adb, options.serial, port) return devutil.waitForPort(adb, options.serial, port)
}) })
.then(function(port) { .then(function(conn) {
return adb.openMonkeyAsync(options.serial, port) return monkey.connectStream(conn)
}) })
.then(function(monkey) { .then(function(monkey) {
services.input = services.input =

4
lib/util/devutil.js
View file

@ -46,8 +46,8 @@ devutil.waitForPort = function(adb, serial, port) {
} }
return adb.openTcpAsync(serial, port) return adb.openTcpAsync(serial, port)
.then(function(conn) { .then(function(conn) {
conn.end() conn.port = port
return port return conn
}) })
.catch(closedError, function(err) { .catch(closedError, function(err) {
return Promise.delay(100) return Promise.delay(100)