Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit b1294c2

Browse files
committed
try concurrency for module tests
1 parent f4fc3f5 commit b1294c2

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

karma-modules.conf.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ var sharedConfig = require('./karma-shared.conf');
66
module.exports = function(config) {
77
var angularModule = process.env.KARMA_MODULE;
88

9-
sharedConfig(config, {testName: 'AngularJS: module ' + angularModule, logFile: 'karma-modules-' + angularModule + '.log'});
9+
sharedConfig(config, {
10+
testName: 'AngularJS: module ' + angularModule,
11+
logFile: 'karma-modules-' + angularModule + '.log'
12+
});
1013

1114
config.set({
1215
files: angularFiles.mergeFilesFor('karmaModules-' + angularModule)

karma-shared.conf.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,8 @@ module.exports = function(config, specificOptions) {
177177
if (process.env.TRAVIS) {
178178
var buildLabel = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')';
179179

180+
config.concurrency = 4;
181+
180182
// Karma (with socket.io 1.x) buffers by 50 and 50 tests can take a long time on IEs;-)
181183
config.browserNoActivityTimeout = 120000;
182184

@@ -195,12 +197,12 @@ module.exports = function(config, specificOptions) {
195197
filename: process.env.LOGS_DIR + '/' + (specificOptions.logFile || 'karma.log')
196198
});
197199

198-
if (process.env.BROWSER_PROVIDER === 'saucelabs' || !process.env.BROWSER_PROVIDER) {
199-
// Allocating a browser can take pretty long (eg. if we are out of capacity and need to wait
200-
// for another build to finish) and so the `captureTimeout` typically kills
201-
// an in-queue-pending request, which makes no sense.
202-
config.captureTimeout = 0;
203-
}
200+
// if (process.env.BROWSER_PROVIDER === 'saucelabs' || !process.env.BROWSER_PROVIDER) {
201+
// // Allocating a browser can take pretty long (eg. if we are out of capacity and need to wait
202+
// // for another build to finish) and so the `captureTimeout` typically kills
203+
// // an in-queue-pending request, which makes no sense.
204+
// config.captureTimeout = 0;
205+
// }
204206
}
205207

206208

0 commit comments

Comments
 (0)