Merge pull request #2675 from mochajs/issue/2478

limit browser concurrency on sauce; closes #2478 and #2667
mochajs · Jan 18, 2017 · 52a1957 · 52a1957
2 parents fc1be2c + 91327ff
commit 52a1957
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/karma.conf.js b/karma.conf.js
@@ -174,6 +174,8 @@ function addSauceTests (cfg) {
     startConnect: true
   };
 
+  cfg.concurrency = 5;
+
   // for slow browser booting, ostensibly
   cfg.captureTimeout = 120000;
   cfg.browserNoActivityTimeout = 20000;

diff --git a/package.json b/package.json
@@ -329,7 +329,7 @@
     "eslint-plugin-standard": "2.0.1",
     "expect.js": "^0.3.1",
     "istanbul-combine": "^0.3.0",
-    "karma": "^1.1.0",
+    "karma": "1.3.0",
     "karma-browserify": "^5.0.5",
     "karma-chrome-launcher": "^2.0.0",
     "karma-expect": "^1.1.2",