Limit the number of browser configurations tested by sauce by default.

We seem to be hitting job limits, probably because I've been testing this hard all day. So make passing the sauce tests optional for now. Add IE9 and iOS to the browser configuration set, since `promises-es6-tests` version 0.5.0 fixes the strict mode issues. See: promises-es6/promises-es6#1
paulmillr · Sep 4, 2014 · 5edc197 · 5edc197
1 parent 135e119
commit 5edc197
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: node_js
 node_js:
   - "0.11"
-  - "0.10"
   - "0.9"
   - "0.8"
   - "0.6"
@@ -10,17 +9,23 @@ before_install:
   - '[ "${TRAVIS_NODE_VERSION}" == "0.6" ] || npm install -g npm@~1.4.6'
   - npm install -g grunt-cli
 script:
-  - npm test
-  - '[ "${TRAVIS_NODE_VERSION}" != "0.10" ] || npm run sauce'
+  - 'if [ "${TRAVIS_RUN_SAUCE}" == "true" ]; then npm run sauce ; else npm test ; fi'
 addons:
   sauce_connect: true
 matrix:
   fast_finish: true
+  include:
+    - node_js: "0.10"
+      env: TRAVIS_RUN_SAUCE=true
+    - node_js: "0.10"
+      env: TRAVIS_RUN_SAUCE=false
   allow_failures:
     - node_js: "0.11"
     - node_js: "0.9"
     - node_js: "0.6"
     - node_js: "0.4"
+    - node_js: "0.10"
+      env: TRAVIS_RUN_SAUCE=true
 env:
   global:
     - secure: YD4HLTE93NhSxa+64MYHhnbJ2ZkREp/HGiFGE4q+AWShqAiehtqE/K3hQUe7p0+1/2/34avhm2bz31j508ayCobm6SSUhpleJH58IK3v4LI2o9qtM+2N/MPJFOIvbziHqOM6fPluowU0k3OSdEAp4U+6S23wKSuXzcUSK8upAiM=

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -2,30 +2,33 @@ module.exports = function(grunt) {
   var browsers = [
     { browserName: "firefox", version: "19", platform: "XP" },
     { browserName: "firefox", platform: "linux" },
-    { browserName: "firefox", platform: "linux", version: "30" },
-    { browserName: "firefox", platform: "linux", version: "25" },
-    { browserName: "firefox", platform: "OS X 10.9" },
-    { browserName: "chrome", platform: "XP" },
     { browserName: "chrome", platform: "linux" },
-    { browserName: "chrome", platform: "OS X 10.9" },
     { browserName: "internet explorer", platform: "Windows 8.1", version: "11" },
     { browserName: "internet explorer", platform: "WIN8", version: "10" },
-    // XXX failing due to strict mode assumptions in `promises-es6-tests`
-    //{ browserName: "internet explorer", platform: "VISTA", version: "9" },
+    { browserName: "internet explorer", platform: "VISTA", version: "9" },
     { browserName: 'safari', platform: 'OS X 10.6' },
     { browserName: 'safari', platform: 'OS X 10.8' },
     { browserName: 'safari', platform: 'OS X 10.9' },
     { browserName: 'iphone', platform: 'OS X 10.9', version: '7.1' },
-    { browserName: 'iphone', platform: 'OS X 10.8', version: '6.1' },
-    // XXX failing due to strict mode assumptions in `promises-es6-tests`
-    //{ browserName: 'iphone', platform: 'OS X 10.8', version: '5.1' },
     { browserName: 'android', platform: 'Linux', version: '4.4' },
+  ];
+  var extraBrowsers = [
+    { browserName: "firefox", platform: "linux", version: "30" },
+    { browserName: "firefox", platform: "linux", version: "25" },
+    { browserName: "firefox", platform: "OS X 10.9" },
+    { browserName: "chrome", platform: "XP" },
+    { browserName: "chrome", platform: "OS X 10.9" },
+    { browserName: 'iphone', platform: 'OS X 10.8', version: '6.1' },
+    { browserName: 'iphone', platform: 'OS X 10.8', version: '5.1' },
     { browserName: 'android', platform: 'Linux', version: '4.2' },
     // XXX haven't investigated these:
     //{ browserName: "opera", platform: "Windows 2008", version: "12" }
     //{ browserName: 'iphone', platform: 'OS X 10.6', version: '4.3' },
     //{ browserName: 'android', platform: 'Linux', version: '4.0' },
   ];
+  if (grunt.option('extra')) {
+      browsers = browsers.concat(extraBrowsers);
+  }
   grunt.initConfig({
     connect: {
       server: {
@@ -39,18 +42,21 @@ module.exports = function(grunt) {
     'saucelabs-mocha': {
       all: {
         options: {
-          urls: [
-            "http://localhost:9999/test/",
-            "http://localhost:9999/test-sham/"
-          ],
-          tunnelTimeout: 5,
+          urls: (function() {
+	    var urls = ["http://localhost:9999/test/"];
+	    if (grunt.option('extra')) {
+	      urls.push("http://localhost:9999/test-sham/");
+	    }
+	    return urls;
+	  })(),
+          //tunnelTimeout: 5,
           build: process.env.TRAVIS_BUILD_NUMBER,
           tunneled: !process.env.SAUCE_HAS_TUNNEL,
           identifier: process.env.TRAVIS_JOB_NUMBER,
           sauceConfig: {
             'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER
           },
-          concurrency: 3,
+          //concurrency: 3,
           browsers: browsers,
           testname: (function() {
             var testname = "mocha";