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 "Fix adbkit API invocations (#524)" (#528)

Browse Source 
This reverts commit 6f09708304.
This commit is contained in:
Karol Wrótniak
2022-05-12 10:08:47 +02:00
committed by GitHub
parent eacc7bbca7
commit e60bcee3fc
14 changed files with 11377 additions and 11710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/util/devutil.js
View File

@@ -3,7 +3,6 @@ var util = require('util')
var split = require('split')
var Promise = require('bluebird')
var androidDeviceList = require('android-device-list')
var deviceClient = require('@devicefarmer/adbkit').DeviceClient
var devutil = module.exports = Object.create(null)
@@ -72,8 +71,7 @@ devutil.listPidsByComm = function(adb, serial, comm, bin) {
})
}
var client = deviceClient(adb, serial)
return client.shell('ps 2>/dev/null')
return adb.shell(serial, 'ps 2>/dev/null')
.then(findProcess)
.then(function(res) {
// return pids if process can be found in the output of 'ps' command
@@ -83,7 +81,7 @@ devutil.listPidsByComm = function(adb, serial, comm, bin) {
}
// otherwise try to run 'ps -elf'
else {
return client.shell('ps -lef 2>/dev/null')
return adb.shell(serial, 'ps -lef 2>/dev/null')
.then(findProcess)
.then(function(res) {
return Promise.resolve(res.pids)