Build: set default testswarm timeout to 15 minutes

We're not testing on IE6-7 anymore.

(cherry-picked from a0568b07d8dcd94c3b8a27c0cf5747235c6bf93c)

diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js
index 91abf2794fa82b98fae6cf352366a0e0b9fefa2f..473bc9e72096408fa6dad077e68b6dd3b659a71a 100644 (file)
--- a/build/tasks/testswarm.js
+++ b/build/tasks/testswarm.js
@@ -17,7 +17,7 @@ module.exports = function( grunt ) {
                        // We got an array, parse it
                        browserSets = JSON.parse( browserSets );
                }
-               timeout = timeout || 1000 * 60 * 30;
+               timeout = timeout || 1000 * 60 * 15;
                tests = grunt.config([ this.name, "tests" ]);
 
                if ( pull ) {