Merge pull request #4628 from timstanley1985/master

Fix build on RPi.  Building from source timesout on karma tests so increase timeouts
This commit is contained in:
Torkel Ödegaard 2016-04-13 10:32:46 -04:00
commit 23dc85c1de

View File

@ -24,9 +24,10 @@ module.exports = function(config) {
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['PhantomJS'],
captureTimeout: 2000,
captureTimeout: 20000,
singleRun: true,
autoWatchBatchDelay: 1000,
autoWatchBatchDelay: 10000,
browserNoActivityTimeout: 60000,
});