starred/stf-DeviceFarmer
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-18 08:03:30 +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/forward/index.js
View File

@@ -9,6 +9,7 @@ var logger = require('../../../../util/logger')
var lifecycle = require('../../../../util/lifecycle')
var streamutil = require('../../../../util/streamutil')
var wireutil = require('../../../../wire/util')
var DeviceClient = require('@devicefarmer/adbkit/dist/src/adb/DeviceClient').default
var ForwardManager = require('./util/manager')
@@ -19,13 +20,14 @@ module.exports = syrup.serial()
.dependency(require('../../resources/minirev'))
.dependency(require('../group'))
.define(function(options, adb, router, push, minirev, group) {
var deviceClient = new DeviceClient(adb, options.serial)
var log = logger.createLogger('device:plugins:forward')
var plugin = Object.create(null)
var manager = new ForwardManager()
function startService() {
log.info('Launching reverse port forwarding service')
return adb.shell(options.serial, [
return deviceClient.shell([
'exec'
, minirev.bin
])
@@ -38,7 +40,7 @@ module.exports = syrup.serial()
function connectService(times) {
function tryConnect(times, delay) {
return adb.openLocal(options.serial, 'localabstract:minirev')
return deviceClient.openLocal('localabstract:minirev')
.timeout(10000)
.catch(function(err) {
if (/closed/.test(err.message) && times > 1) {