Use karma concurrency for initiating parallel sauce tests

jashkenas · Oct 22, 2015 · 6a13302 · 6a13302
1 parent 13fe120
commit 6a13302
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,12 +18,7 @@ before_script:
 script:
   - npm test
   - "[ $BROWSER == false ] || npm run test-browser"
-  # Karma sauce is limited to running about 5-7 browsers (or it will tiemout) at a time so we just run vendor by vendor here
-  - "[ $BROWSER == false ] || karma start karma.conf-sauce.js --browsers FIREFOX_V4,FIREFOX_V11,FIREFOX_V20,FIREFOX_V30,FIREFOX_V35"
-  - "[ $BROWSER == false ] || karma start karma.conf-sauce.js --browsers CHROME_V28,CHROME_V35,CHROME_V40,ANDROID_V4.0,ANDROID_V4.3"
-  - "[ $BROWSER == false ] || karma start karma.conf-sauce.js --browsers INTERNET_EXPLORER_V9,INTERNET_EXPLORER_V10,INTERNET_EXPLORER_V11,MICROSOFTEDGE_V20.10240"
-  - "[ $BROWSER == false ] || karma start karma.conf-sauce.js --browsers SAFARI_V5,SAFARI_V6,SAFARI_V7"
-  - "[ $BROWSER == false ] || karma start karma.conf-sauce.js --browsers OPERA_V11,OPERA_V12"
+  - "[ $BROWSER == false ] || karma start karma.conf-sauce.js"
 notifications:
   email: false
 env:

diff --git a/karma.conf-sauce.js b/karma.conf-sauce.js
@@ -59,6 +59,10 @@ module.exports = function(config) {
       'underscore.js',
       '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
@@ -20,7 +20,7 @@
     "coveralls": "^2.11.2",
     "docco": "*",
     "eslint": "0.21.x",
-    "karma": "~0.12.31",
+    "karma": "~0.13.0",
     "karma-qunit": "~0.1.4",
     "nyc": "^2.1.3",
     "qunit-cli": "~0.2.0",