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

14
lib/units/device/plugins/install.js
View File

@@ -2,6 +2,7 @@ var stream = require('stream')
var url = require('url')
var util = require('util')
var DeviceClient = require('@devicefarmer/adbkit/dist/src/adb/DeviceClient').default
var syrup = require('@devicefarmer/stf-syrup')
var request = require('request')
var Promise = require('bluebird')
@@ -23,6 +24,7 @@ module.exports = syrup.serial()
.dependency(require('../support/router'))
.dependency(require('../support/push'))
.define(function(options, adb, router, push) {
var deviceClient = new DeviceClient(adb, options.serial)
var log = logger.createLogger('device:plugins:install')
router.on(wire.InstallMessage, function(channel, message) {
@@ -55,7 +57,7 @@ module.exports = syrup.serial()
var source = new stream.Readable().wrap(req)
var target = '/data/local/tmp/_app.apk'
return adb.push(options.serial, source, target)
return deviceClient.push(source, target)
.timeout(10000)
.then(function(transfer) {
var resolver = Promise.defer()
@@ -103,7 +105,7 @@ module.exports = syrup.serial()
sendProgress('installing_app', guesstimate)
return promiseutil.periodicNotify(
adb.installRemote(options.serial, apk)
deviceClient.installRemote(apk)
.timeout(60000 * 5)
.catch(function(err) {
switch (err.code) {
@@ -113,10 +115,10 @@ module.exports = syrup.serial()
'Uninstalling "%s" first due to inconsistent certificates'
, pkg
)
return adb.uninstall(options.serial, pkg)
return deviceClient.uninstall(pkg)
.timeout(15000)
.then(function() {
return adb.installRemote(options.serial, apk)
return deviceClient.installRemote(apk)
.timeout(60000 * 5)
})
default:
@@ -162,7 +164,7 @@ module.exports = syrup.serial()
)
// Progress 90%
sendProgress('launching_app', 90)
return adb.startActivity(options.serial, launchActivity)
return deviceClient.startActivity(launchActivity)
.timeout(30000)
}
}
@@ -205,7 +207,7 @@ module.exports = syrup.serial()
var reply = wireutil.reply(options.serial)
adb.uninstall(options.serial, message.packageName)
deviceClient.uninstall(message.packageName)
.then(function() {
push.send([
channel