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

Fix adb invocations (#202)

Browse Source
This commit is contained in:
Karol Wrótniak
2021-03-10 14:50:33 +01:00
committed by GitHub
parent 50ee38c2ce
commit 5dfdd9ac63
18 changed files with 79 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/units/device/plugins/touch/index.js
View File

@@ -6,6 +6,7 @@ var split = require('split')
var EventEmitter = require('eventemitter3')
var adbkit = require('@devicefarmer/adbkit')
var Parser = require('@devicefarmer/adbkit/dist/src/adb/parser')
var DeviceClient = require('@devicefarmer/adbkit/dist/src/adb/DeviceClient').default
var wire = require('../../../../wire')
var logger = require('../../../../util/logger')
@@ -21,6 +22,7 @@ module.exports = syrup.serial()
.dependency(require('../../resources/minitouch'))
.dependency(require('../util/flags'))
.define(function(options, adb, router, minitouch, flags) {
var deviceClient = new DeviceClient(adb, options.serial)
var log = logger.createLogger('device:plugins:touch')
function TouchConsumer(config) {
@@ -259,7 +261,7 @@ module.exports = syrup.serial()
TouchConsumer.prototype._connectService = function() {
function tryConnect(times, delay) {
return adb.openLocal(options.serial, 'localabstract:minitouch')
return deviceClient.openLocal('localabstract:minitouch')
.timeout(10000)
.then(function(out) {
return out
@@ -350,7 +352,7 @@ module.exports = syrup.serial()
log.info('Sending %s to minitouch', signal)
return Promise.all([
output.waitForEnd()
, adb.shell(options.serial, ['kill', signum, pid])
, deviceClient.shell(['kill', signum, pid])
.then(adbkit.util.readAll)
.return(true)
])