yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-04 18:29:17 +02:00
Code Issues Releases Wiki Activity

Make boot complete timeout configurable.

Browse source
This commit is contained in:
Simo Kinnunen 2016-12-20 22:48:55 +09:00
parent 3d74cb48ab
commit 72a16ed2ff
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/cli.js
View file

@ -50,6 +50,10 @@ program
, 'heartbeat interval' , 'heartbeat interval'
, Number , Number
, 10000) , 10000)
.option('--boot-complete-timeout <ms>'
, 'how long to wait for boot to complete during device setup'
, Number
, 60000)
.option('--adb-host <host>' .option('--adb-host <host>'
, 'ADB host (defaults to 127.0.0.1)' , 'ADB host (defaults to 127.0.0.1)'
, String , String
@ -120,6 +124,7 @@ program
, '--screen-jpeg-quality', options.screenJpegQuality , '--screen-jpeg-quality', options.screenJpegQuality
, '--connect-url-pattern', options.connectUrlPattern , '--connect-url-pattern', options.connectUrlPattern
, '--heartbeat-interval', options.heartbeatInterval , '--heartbeat-interval', options.heartbeatInterval
, '--boot-complete-timeout', options.bootCompleteTimeout
, '--vnc-initial-size', options.vncInitialSize.join('x') , '--vnc-initial-size', options.vncInitialSize.join('x')
] ]
.concat(options.muteMaster ? ['--mute-master'] : []) .concat(options.muteMaster ? ['--mute-master'] : [])
@ -195,6 +200,10 @@ program
, 'heartbeat interval' , 'heartbeat interval'
, Number , Number
, 10000) , 10000)
.option('--boot-complete-timeout <ms>'
, 'how long to wait for boot to complete during device setup'
, Number
, 60000)
.option('--mute-master' .option('--mute-master'
, 'whether to mute master volume when devices are being used') , 'whether to mute master volume when devices are being used')
.option('--lock-rotation' .option('--lock-rotation'
@ -244,6 +253,7 @@ program
, vncPort: options.vncPort , vncPort: options.vncPort
, vncInitialSize: options.vncInitialSize , vncInitialSize: options.vncInitialSize
, heartbeatInterval: options.heartbeatInterval , heartbeatInterval: options.heartbeatInterval
, bootCompleteTimeout: options.bootCompleteTimeout
, muteMaster: options.muteMaster , muteMaster: options.muteMaster
, lockRotation: options.lockRotation , lockRotation: options.lockRotation
, cleanup: options.cleanup , cleanup: options.cleanup

2
lib/units/device/support/adb.js
View file

@ -22,7 +22,7 @@ module.exports = syrup.serial()
.progressed(function() { .progressed(function() {
log.info('Waiting for boot to complete') log.info('Waiting for boot to complete')
}) })
.timeout(60000) .timeout(options.bootCompleteTimeout)
} }
return ensureBootComplete() return ensureBootComplete()