starred/stf-DeviceFarmer
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-17 23:53:25 +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

10
lib/units/device/resources/minitouch.js
View File

@@ -9,13 +9,11 @@ var pathutil = require('../../../util/pathutil')
var devutil = require('../../../util/devutil')
var streamutil = require('../../../util/streamutil')
var Resource = require('./util/resource')
var DeviceClient = require('@devicefarmer/adbkit/dist/src/adb/DeviceClient').default
module.exports = syrup.serial()
.dependency(require('../support/adb'))
.dependency(require('../support/abi'))
.define(function(options, adb, abi) {
var deviceClient = new DeviceClient(adb, options.serial)
var log = logger.createLogger('device:resources:minitouch')
var resources = {
@@ -37,7 +35,7 @@ module.exports = syrup.serial()
}
function removeResource(res) {
return deviceClient.shell(['rm', '-f', res.dest])
return adb.shell(options.serial, ['rm', '-f', res.dest])
.timeout(10000)
.then(function(out) {
return streamutil.readAll(out)
@@ -46,7 +44,7 @@ module.exports = syrup.serial()
}
function pushResource(res) {
return deviceClient.push(res.src, res.dest, res.mode)
return adb.push(options.serial, res.src, res.dest, res.mode)
.timeout(10000)
.then(function(transfer) {
return new Promise(function(resolve, reject) {
@@ -61,7 +59,7 @@ module.exports = syrup.serial()
log.info('Installing "%s" as "%s"', res.src, res.dest)
function checkExecutable(res) {
return deviceClient.stat(res.dest)
return adb.stat(options.serial, res.dest)
.timeout(5000)
.then(function(stats) {
// Can't use fs.constants.S_IXUSR due to differences on Windows.
@@ -109,7 +107,7 @@ module.exports = syrup.serial()
return {
bin: resources.bin.dest
, run: function(cmd) {
return deviceClient.shell(util.format(
return adb.shell(options.serial, util.format(
'exec %s%s'
, resources.bin.dest
, cmd ? util.format(' %s', cmd) : ''