1
0
Fork 0
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:
Simo Kinnunen 2014-03-17 22:30:13 +09:00
parent 590c96ea21
commit cc42b7c51f
22 changed files with 23 additions and 23 deletions

View file

@ -6,13 +6,13 @@ module.exports = function(options) {
// Show serial number in logs // Show serial number in logs
logger.setGlobalIdentifier(options.serial) logger.setGlobalIdentifier(options.serial)
return syrup() return syrup.serial()
// We want to send logs before anything else start happening // We want to send logs before anything else start happening
.dependency(require('./device/plugins/logsender')) .dependency(require('./device/plugins/logsender'))
.define(function(options) { .define(function(options) {
var log = logger.createLogger('device') var log = logger.createLogger('device')
log.info('Preparing device') log.info('Preparing device')
return syrup() return syrup.serial()
.dependency(require('./device/plugins/solo')) .dependency(require('./device/plugins/solo'))
.dependency(require('./device/plugins/heartbeat')) .dependency(require('./device/plugins/heartbeat'))
.dependency(require('./device/plugins/display')) .dependency(require('./device/plugins/display'))

View file

@ -2,7 +2,7 @@ var syrup = require('syrup')
var logger = require('../../../util/logger') var logger = require('../../../util/logger')
module.exports = syrup() module.exports = syrup.serial()
.dependency(require('./http')) .dependency(require('./http'))
.define(function(options, http) { .define(function(options, http) {
var log = logger.createLogger('device:plugins:display') var log = logger.createLogger('device:plugins:display')

View file

@ -3,7 +3,7 @@ var syrup = require('syrup')
var wire = require('../../../wire') var wire = require('../../../wire')
var wireutil = require('../../../wire/util') var wireutil = require('../../../wire/util')
module.exports = syrup() module.exports = syrup.serial()
.dependency(require('../support/push')) .dependency(require('../support/push'))
.define(function(options, push) { .define(function(options, push) {
function heartbeat() { function heartbeat() {

View file

@ -11,7 +11,7 @@ var split = require('split')
var logger = require('../../../util/logger') var logger = require('../../../util/logger')
var devutil = require('../../../util/devutil') var devutil = require('../../../util/devutil')
module.exports = syrup() module.exports = syrup.serial()
.dependency(require('../support/adb')) .dependency(require('../support/adb'))
.dependency(require('../support/quit')) .dependency(require('../support/quit'))
.dependency(require('../resources/remote')) .dependency(require('../resources/remote'))

View file

@ -3,7 +3,7 @@ var syrup = require('syrup')
var devutil = require('../../../util/devutil') var devutil = require('../../../util/devutil')
var logger = require('../../../util/logger') var logger = require('../../../util/logger')
module.exports = syrup() module.exports = syrup.serial()
.dependency(require('../support/properties')) .dependency(require('../support/properties'))
.dependency(require('./display')) .dependency(require('./display'))
.define(function(options, properties, display) { .define(function(options, properties, display) {

View file

@ -11,7 +11,7 @@ var keyutil = require('../../../util/keyutil')
var streamutil = require('../../../util/streamutil') var streamutil = require('../../../util/streamutil')
var logger = require('../../../util/logger') var logger = require('../../../util/logger')
module.exports = syrup() module.exports = syrup.serial()
.dependency(require('../support/adb')) .dependency(require('../support/adb'))
.dependency(require('../support/router')) .dependency(require('../support/router'))
.dependency(require('../support/push')) .dependency(require('../support/push'))

View file

@ -4,7 +4,7 @@ var logger = require('../../../util/logger')
var wire = require('../../../wire') var wire = require('../../../wire')
var wireutil = require('../../../wire/util') var wireutil = require('../../../wire/util')
module.exports = syrup() module.exports = syrup.serial()
.dependency(require('../support/adb')) .dependency(require('../support/adb'))
.dependency(require('../support/router')) .dependency(require('../support/router'))
.dependency(require('../support/quit')) .dependency(require('../support/quit'))

View file

@ -5,7 +5,7 @@ var logger = require('../../../util/logger')
var wire = require('../../../wire') var wire = require('../../../wire')
var wireutil = require('../../../wire/util') var wireutil = require('../../../wire/util')
module.exports = syrup() module.exports = syrup.serial()
.dependency(require('../support/push')) .dependency(require('../support/push'))
.dependency(require('../support/quit')) .dependency(require('../support/quit'))
.define(function(options, push, quit) { .define(function(options, push, quit) {

View file

@ -6,7 +6,7 @@ var wire = require('../../../wire')
var wireutil = require('../../../wire/util') var wireutil = require('../../../wire/util')
var devutil = require('../../../util/devutil') var devutil = require('../../../util/devutil')
module.exports = syrup() module.exports = syrup.serial()
.dependency(require('./identity')) .dependency(require('./identity'))
.dependency(require('./input')) .dependency(require('./input'))
.dependency(require('../support/router')) .dependency(require('../support/router'))

View file

@ -5,7 +5,7 @@ var logger = require('../../../util/logger')
var wire = require('../../../wire') var wire = require('../../../wire')
var wireutil = require('../../../wire/util') var wireutil = require('../../../wire/util')
module.exports = syrup() module.exports = syrup.serial()
.dependency(require('../support/adb')) .dependency(require('../support/adb'))
.dependency(require('../support/router')) .dependency(require('../support/router'))
.dependency(require('../support/push')) .dependency(require('../support/push'))

View file

@ -4,7 +4,7 @@ var logger = require('../../../util/logger')
var wire = require('../../../wire') var wire = require('../../../wire')
var wireutil = require('../../../wire/util') var wireutil = require('../../../wire/util')
module.exports = syrup() module.exports = syrup.serial()
.dependency(require('../support/sub')) .dependency(require('../support/sub'))
.dependency(require('../support/push')) .dependency(require('../support/push'))
.dependency(require('../support/channels')) .dependency(require('../support/channels'))

View file

@ -4,7 +4,7 @@ var split = require('split')
var logger = require('../../../util/logger') var logger = require('../../../util/logger')
var devutil = require('../../../util/devutil') var devutil = require('../../../util/devutil')
module.exports = syrup() module.exports = syrup.serial()
.dependency(require('../support/adb')) .dependency(require('../support/adb'))
.dependency(require('../support/quit')) .dependency(require('../support/quit'))
.dependency(require('../resources/remote')) .dependency(require('../resources/remote'))

View file

@ -7,7 +7,7 @@ var wire = require('../../../wire')
var devutil = require('../../../util/devutil') var devutil = require('../../../util/devutil')
var logger = require('../../../util/logger') var logger = require('../../../util/logger')
module.exports = syrup() module.exports = syrup.serial()
.dependency(require('../support/adb')) .dependency(require('../support/adb'))
.dependency(require('../support/router')) .dependency(require('../support/router'))
.dependency(require('../support/quit')) .dependency(require('../support/quit'))

View file

@ -8,7 +8,7 @@ var pathutil = require('../../../util/pathutil')
var streamutil = require('../../../util/streamutil') var streamutil = require('../../../util/streamutil')
var logger = require('../../../util/logger') var logger = require('../../../util/logger')
module.exports = syrup() module.exports = syrup.serial()
.dependency(require('../support/adb')) .dependency(require('../support/adb'))
.define(function(options, adb) { .define(function(options, adb) {
var log = logger.createLogger('device:resources:inputagent') var log = logger.createLogger('device:resources:inputagent')

View file

@ -8,7 +8,7 @@ var pathutil = require('../../../util/pathutil')
var devutil = require('../../../util/devutil') var devutil = require('../../../util/devutil')
var streamutil = require('../../../util/streamutil') var streamutil = require('../../../util/streamutil')
module.exports = syrup() module.exports = syrup.serial()
.dependency(require('../support/adb')) .dependency(require('../support/adb'))
.dependency(require('../support/properties')) .dependency(require('../support/properties'))
.define(function(options, adb, properties) { .define(function(options, adb, properties) {

View file

@ -5,7 +5,7 @@ var adbkit = require('adbkit')
var logger = require('../../../util/logger') var logger = require('../../../util/logger')
var promiseutil = require('../../../util/promiseutil') var promiseutil = require('../../../util/promiseutil')
module.exports = syrup() module.exports = syrup.serial()
.define(function(options) { .define(function(options) {
var log = logger.createLogger('device:support:adb') var log = logger.createLogger('device:support:adb')
var adb = adbkit.createClient() var adb = adbkit.createClient()

View file

@ -3,7 +3,7 @@ var syrup = require('syrup')
var logger = require('../../../util/logger') var logger = require('../../../util/logger')
var ChannelManager = require('../../../wire/channelmanager') var ChannelManager = require('../../../wire/channelmanager')
module.exports = syrup() module.exports = syrup.serial()
.define(function(options, router) { .define(function(options, router) {
var log = logger.createLogger('device:support:channels') var log = logger.createLogger('device:support:channels')
var channels = new ChannelManager() var channels = new ChannelManager()

View file

@ -3,7 +3,7 @@ var syrup = require('syrup')
var devutil = require('../../../util/devutil') var devutil = require('../../../util/devutil')
var logger = require('../../../util/logger') var logger = require('../../../util/logger')
module.exports = syrup() module.exports = syrup.serial()
.dependency(require('./adb')) .dependency(require('./adb'))
.define(function(options, adb) { .define(function(options, adb) {
var log = logger.createLogger('device:support:properties') var log = logger.createLogger('device:support:properties')

View file

@ -4,7 +4,7 @@ var zmq = require('zmq')
var logger = require('../../../util/logger') var logger = require('../../../util/logger')
module.exports = syrup() module.exports = syrup.serial()
.define(function(options) { .define(function(options) {
var log = logger.createLogger('device:support:push') var log = logger.createLogger('device:support:push')

View file

@ -3,7 +3,7 @@ var syrup = require('syrup')
var logger = require('../../../util/logger') var logger = require('../../../util/logger')
module.exports = syrup() module.exports = syrup.serial()
.define(function(options) { .define(function(options) {
var log = logger.createLogger('device:support:quit') var log = logger.createLogger('device:support:quit')
var cleanup = [] var cleanup = []

View file

@ -3,7 +3,7 @@ var syrup = require('syrup')
var logger = require('../../../util/logger') var logger = require('../../../util/logger')
var wirerouter = require('../../../wire/router') var wirerouter = require('../../../wire/router')
module.exports = syrup() module.exports = syrup.serial()
.dependency(require('./sub')) .dependency(require('./sub'))
.dependency(require('./channels')) .dependency(require('./channels'))
.define(function(options, sub, channels) { .define(function(options, sub, channels) {

View file

@ -5,7 +5,7 @@ var zmq = require('zmq')
var logger = require('../../../util/logger') var logger = require('../../../util/logger')
var wireutil = require('../../../wire/util') var wireutil = require('../../../wire/util')
module.exports = syrup() module.exports = syrup.serial()
.dependency(require('./channels')) .dependency(require('./channels'))
.define(function(options, channels) { .define(function(options, channels) {
var log = logger.createLogger('device:support:sub') var log = logger.createLogger('device:support:sub')