[Pkg-javascript-commits] [backbone] 35/173: Use karma concurrency for initiating parallel sauce tests

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository backbone.

commit 02548a4bee41b31e53fe2a000813dac1233801ef
Author: Graeme Yeates <yeatesgraeme at gmail.com>
Date:   Thu Oct 22 10:01:28 2015 -0400

    Use karma concurrency for initiating parallel sauce tests
---
 .travis.yml         | 5 +----
 karma.conf-sauce.js | 3 +++
 package.json        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f9153e6..d339cbd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,10 +10,7 @@ before_script:
   - sh -e /etc/init.d/xvfb start
 script:
   - npm test
-  # Karma sauce is limited to running about 5-7 browsers (or it will timeout) at a time so we just run vendor by vendor here
-  - karma start karma.conf-sauce.js --browsers FIREFOX_V4,FIREFOX_V11,FIREFOX_V21,FIREFOX_V30,FIREFOX_V35,CHROME_V26,CHROME_V31,CHROME_V39,CHROME_V40,ANDROID_V4.0,ANDROID_V4.3
-  - karma start karma.conf-sauce.js --browsers IE_V7,IE_V8,IE_V9,IE_V10,IE_V11,MICROSOFTEDGE_V20.10240
-  - karma start karma.conf-sauce.js --browsers SAFARI_V5,SAFARI_V6,SAFARI_V7,SAFARI_V8.0,OPERA_V11,OPERA_V12
+  - karma start karma.conf-sauce.js
 notifications:
   email: false
 sudo: false
diff --git a/karma.conf-sauce.js b/karma.conf-sauce.js
index 110461b..4ad0176 100644
--- a/karma.conf-sauce.js
+++ b/karma.conf-sauce.js
@@ -70,6 +70,9 @@ module.exports = function(config) {
         'test/*.js'
     ],
 
+    // Number of sauce tests to start in parallel
+    concurrency: 5,
+
     // test results reporter to use
     reporters: ['dots', 'saucelabs'],
     port: 9876,
diff --git a/package.json b/package.json
index 4788d39..e3c4ae6 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   "devDependencies": {
     "coffee-script": "1.7.1",
     "docco": "0.7.0",
-    "karma": "^0.12.31",
+    "karma": "^0.13.12",
     "karma-phantomjs-launcher": "^0.1.4",
     "karma-qunit": "^0.1.5",
     "qunitjs": "^1.18.0",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/backbone.git