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

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/units/device/support/adb.js
View File

@@ -1,7 +1,6 @@
var syrup = require('@devicefarmer/stf-syrup')
var adbkit = require('@devicefarmer/adbkit').Adb
var deviceClient = require('@devicefarmer/adbkit').DeviceClient
var adbkit = require('@devicefarmer/adbkit')
var logger = require('../../../util/logger')
var promiseutil = require('../../../util/promiseutil')
@@ -16,9 +15,8 @@ module.exports = syrup.serial()
adb.Keycode = adbkit.Keycode
function ensureBootComplete() {
var client = deviceClient(adb, options.serial)
return promiseutil.periodicNotify(
client.waitBootComplete()
adb.waitBootComplete(options.serial)
, 1000
)
.progressed(function() {

4
lib/units/device/support/properties.js
View File

@@ -1,5 +1,4 @@
var syrup = require('@devicefarmer/stf-syrup')
var deviceClient = require('@devicefarmer/adbkit').DeviceClient
var logger = require('../../../util/logger')
@@ -10,8 +9,7 @@ module.exports = syrup.serial()
function load() {
log.info('Loading properties')
var client = deviceClient(adb, options.serial)
return client.getProperties()
return adb.getProperties(options.serial)
.timeout(10000)
}