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

8
lib/units/device/resources/minirev.js
View File

@@ -9,12 +9,14 @@ 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/properties'))
.dependency(require('../support/abi'))
.define(function(options, adb, properties, abi) {
var deviceClient = new DeviceClient(adb, options.serial)
var log = logger.createLogger('device:resources:minirev')
var resources = {
@@ -36,7 +38,7 @@ module.exports = syrup.serial()
}
function removeResource(res) {
return adb.shell(options.serial, ['rm', '-f', res.dest])
return deviceClient.shell(['rm', '-f', res.dest])
.timeout(10000)
.then(function(out) {
return streamutil.readAll(out)
@@ -45,7 +47,7 @@ module.exports = syrup.serial()
}
function pushResource(res) {
return adb.push(options.serial, res.src, res.dest, res.mode)
return deviceClient.push(res.src, res.dest, res.mode)
.timeout(10000)
.then(function(transfer) {
return new Promise(function(resolve, reject) {
@@ -60,7 +62,7 @@ module.exports = syrup.serial()
log.info('Installing "%s" as "%s"', res.src, res.dest)
function checkExecutable(res) {
return adb.stat(options.serial, res.dest)
return deviceClient.stat(res.dest)
.timeout(5000)
.then(function(stats) {
// Can't use fs.constants.S_IXUSR due to differences on Windows.