mirror of
https://github.com/openstf/stf
synced 2025-10-04 18:29:17 +02:00
It seems that it's simply impossible to run too many things in parallel over ADB on a single device. Really weird stuff happening, like completely unrelated shell calls using files created by other shell calls. Switch back to serial implementation.
This commit is contained in:
parent
590c96ea21
commit
cc42b7c51f
22 changed files with 23 additions and 23 deletions
|
@ -6,13 +6,13 @@ module.exports = function(options) {
|
|||
// Show serial number in logs
|
||||
logger.setGlobalIdentifier(options.serial)
|
||||
|
||||
return syrup()
|
||||
return syrup.serial()
|
||||
// We want to send logs before anything else start happening
|
||||
.dependency(require('./device/plugins/logsender'))
|
||||
.define(function(options) {
|
||||
var log = logger.createLogger('device')
|
||||
log.info('Preparing device')
|
||||
return syrup()
|
||||
return syrup.serial()
|
||||
.dependency(require('./device/plugins/solo'))
|
||||
.dependency(require('./device/plugins/heartbeat'))
|
||||
.dependency(require('./device/plugins/display'))
|
||||
|
|
|
@ -2,7 +2,7 @@ var syrup = require('syrup')
|
|||
|
||||
var logger = require('../../../util/logger')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.dependency(require('./http'))
|
||||
.define(function(options, http) {
|
||||
var log = logger.createLogger('device:plugins:display')
|
||||
|
|
|
@ -3,7 +3,7 @@ var syrup = require('syrup')
|
|||
var wire = require('../../../wire')
|
||||
var wireutil = require('../../../wire/util')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.dependency(require('../support/push'))
|
||||
.define(function(options, push) {
|
||||
function heartbeat() {
|
||||
|
|
|
@ -11,7 +11,7 @@ var split = require('split')
|
|||
var logger = require('../../../util/logger')
|
||||
var devutil = require('../../../util/devutil')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.dependency(require('../support/adb'))
|
||||
.dependency(require('../support/quit'))
|
||||
.dependency(require('../resources/remote'))
|
||||
|
|
|
@ -3,7 +3,7 @@ var syrup = require('syrup')
|
|||
var devutil = require('../../../util/devutil')
|
||||
var logger = require('../../../util/logger')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.dependency(require('../support/properties'))
|
||||
.dependency(require('./display'))
|
||||
.define(function(options, properties, display) {
|
||||
|
|
|
@ -11,7 +11,7 @@ var keyutil = require('../../../util/keyutil')
|
|||
var streamutil = require('../../../util/streamutil')
|
||||
var logger = require('../../../util/logger')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.dependency(require('../support/adb'))
|
||||
.dependency(require('../support/router'))
|
||||
.dependency(require('../support/push'))
|
||||
|
|
|
@ -4,7 +4,7 @@ var logger = require('../../../util/logger')
|
|||
var wire = require('../../../wire')
|
||||
var wireutil = require('../../../wire/util')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.dependency(require('../support/adb'))
|
||||
.dependency(require('../support/router'))
|
||||
.dependency(require('../support/quit'))
|
||||
|
|
|
@ -5,7 +5,7 @@ var logger = require('../../../util/logger')
|
|||
var wire = require('../../../wire')
|
||||
var wireutil = require('../../../wire/util')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.dependency(require('../support/push'))
|
||||
.dependency(require('../support/quit'))
|
||||
.define(function(options, push, quit) {
|
||||
|
|
|
@ -6,7 +6,7 @@ var wire = require('../../../wire')
|
|||
var wireutil = require('../../../wire/util')
|
||||
var devutil = require('../../../util/devutil')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.dependency(require('./identity'))
|
||||
.dependency(require('./input'))
|
||||
.dependency(require('../support/router'))
|
||||
|
|
|
@ -5,7 +5,7 @@ var logger = require('../../../util/logger')
|
|||
var wire = require('../../../wire')
|
||||
var wireutil = require('../../../wire/util')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.dependency(require('../support/adb'))
|
||||
.dependency(require('../support/router'))
|
||||
.dependency(require('../support/push'))
|
||||
|
|
|
@ -4,7 +4,7 @@ var logger = require('../../../util/logger')
|
|||
var wire = require('../../../wire')
|
||||
var wireutil = require('../../../wire/util')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.dependency(require('../support/sub'))
|
||||
.dependency(require('../support/push'))
|
||||
.dependency(require('../support/channels'))
|
||||
|
|
|
@ -4,7 +4,7 @@ var split = require('split')
|
|||
var logger = require('../../../util/logger')
|
||||
var devutil = require('../../../util/devutil')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.dependency(require('../support/adb'))
|
||||
.dependency(require('../support/quit'))
|
||||
.dependency(require('../resources/remote'))
|
||||
|
|
|
@ -7,7 +7,7 @@ var wire = require('../../../wire')
|
|||
var devutil = require('../../../util/devutil')
|
||||
var logger = require('../../../util/logger')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.dependency(require('../support/adb'))
|
||||
.dependency(require('../support/router'))
|
||||
.dependency(require('../support/quit'))
|
||||
|
|
|
@ -8,7 +8,7 @@ var pathutil = require('../../../util/pathutil')
|
|||
var streamutil = require('../../../util/streamutil')
|
||||
var logger = require('../../../util/logger')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.dependency(require('../support/adb'))
|
||||
.define(function(options, adb) {
|
||||
var log = logger.createLogger('device:resources:inputagent')
|
||||
|
|
|
@ -8,7 +8,7 @@ var pathutil = require('../../../util/pathutil')
|
|||
var devutil = require('../../../util/devutil')
|
||||
var streamutil = require('../../../util/streamutil')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.dependency(require('../support/adb'))
|
||||
.dependency(require('../support/properties'))
|
||||
.define(function(options, adb, properties) {
|
||||
|
|
|
@ -5,7 +5,7 @@ var adbkit = require('adbkit')
|
|||
var logger = require('../../../util/logger')
|
||||
var promiseutil = require('../../../util/promiseutil')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.define(function(options) {
|
||||
var log = logger.createLogger('device:support:adb')
|
||||
var adb = adbkit.createClient()
|
||||
|
|
|
@ -3,7 +3,7 @@ var syrup = require('syrup')
|
|||
var logger = require('../../../util/logger')
|
||||
var ChannelManager = require('../../../wire/channelmanager')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.define(function(options, router) {
|
||||
var log = logger.createLogger('device:support:channels')
|
||||
var channels = new ChannelManager()
|
||||
|
|
|
@ -3,7 +3,7 @@ var syrup = require('syrup')
|
|||
var devutil = require('../../../util/devutil')
|
||||
var logger = require('../../../util/logger')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.dependency(require('./adb'))
|
||||
.define(function(options, adb) {
|
||||
var log = logger.createLogger('device:support:properties')
|
||||
|
|
|
@ -4,7 +4,7 @@ var zmq = require('zmq')
|
|||
|
||||
var logger = require('../../../util/logger')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.define(function(options) {
|
||||
var log = logger.createLogger('device:support:push')
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ var syrup = require('syrup')
|
|||
|
||||
var logger = require('../../../util/logger')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.define(function(options) {
|
||||
var log = logger.createLogger('device:support:quit')
|
||||
var cleanup = []
|
||||
|
|
|
@ -3,7 +3,7 @@ var syrup = require('syrup')
|
|||
var logger = require('../../../util/logger')
|
||||
var wirerouter = require('../../../wire/router')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.dependency(require('./sub'))
|
||||
.dependency(require('./channels'))
|
||||
.define(function(options, sub, channels) {
|
||||
|
|
|
@ -5,7 +5,7 @@ var zmq = require('zmq')
|
|||
var logger = require('../../../util/logger')
|
||||
var wireutil = require('../../../wire/util')
|
||||
|
||||
module.exports = syrup()
|
||||
module.exports = syrup.serial()
|
||||
.dependency(require('./channels'))
|
||||
.define(function(options, channels) {
|
||||
var log = logger.createLogger('device:support:sub')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue