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

@@ -3,12 +3,14 @@ var Promise = require('bluebird')
var _ = require('lodash')
var logger = require('../../../util/logger')
var DeviceClient = require('@devicefarmer/adbkit/dist/src/adb/DeviceClient').default
module.exports = syrup.serial()
.dependency(require('../support/adb'))
.dependency(require('../resources/service'))
.dependency(require('./group'))
.define(function(options, adb, service, group) {
var deviceClient = new DeviceClient(adb, options.serial)
var log = logger.createLogger('device:plugins:cleanup')
var plugin = Object.create(null)
@@ -17,12 +19,12 @@ module.exports = syrup.serial()
}
function listPackages() {
return adb.getPackages(options.serial)
return deviceClient.getPackages()
}
function uninstallPackage(pkg) {
log.info('Cleaning up package "%s"', pkg)
return adb.uninstall(options.serial, pkg)
return deviceClient.uninstall(pkg)
.catch(function(err) {
log.warn('Unable to clean up package "%s"', pkg, err)
return true