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

Revert all adbkit upgrades (#207)

Browse Source
This commit is contained in:
Karol Wrótniak
2021-03-10 19:22:32 +01:00
committed by GitHub
parent 84bf212497
commit 53acc928f5
25 changed files with 60 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,8 +5,7 @@ var syrup = require('@devicefarmer/stf-syrup')
var split = require('split')
var EventEmitter = require('eventemitter3')
var adbkit = require('@devicefarmer/adbkit')
var Parser = require('@devicefarmer/adbkit/dist/src/adb/parser').default
var DeviceClient = require('@devicefarmer/adbkit/dist/src/adb/DeviceClient').default
var Parser = require('@devicefarmer/adbkit/lib/adb/parser')
var wire = require('../../../../wire')
var logger = require('../../../../util/logger')
@@ -22,7 +21,6 @@ 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) {
@@ -261,7 +259,7 @@ module.exports = syrup.serial()
TouchConsumer.prototype._connectService = function() {
function tryConnect(times, delay) {
return deviceClient.openLocal('localabstract:minitouch')
return adb.openLocal(options.serial, 'localabstract:minitouch')
.timeout(10000)
.then(function(out) {
return out
@@ -352,7 +350,7 @@ module.exports = syrup.serial()
log.info('Sending %s to minitouch', signal)
return Promise.all([
output.waitForEnd()
, deviceClient.shell(['kill', signum, pid])
, adb.shell(options.serial, ['kill', signum, pid])
.then(adbkit.util.readAll)
.return(true)
])