Build: Allow to specify timeout in the testswarm task

(cherry-picked from a81dbc4ed8)
This commit is contained in:
Michał Gołębiowski 2014-03-11 21:12:39 +01:00
parent a59a1cd17a
commit c601eae7f6

View File

@ -2,7 +2,7 @@ module.exports = function( grunt ) {
"use strict";
grunt.registerTask( "testswarm", function( commit, configFile, browserSets ) {
grunt.registerTask( "testswarm", function( commit, configFile, browserSets, timeout ) {
var jobName,
testswarm = require( "testswarm" ),
runs = {},
@ -11,10 +11,6 @@ module.exports = function( grunt ) {
config = grunt.file.readJSON( configFile ).jquery,
tests = grunt.config([ this.name, "tests" ]);
if ( !browserSets ) {
browserSets = [ "popular", "ios" ];
}
if ( pull ) {
jobName = "Pull <a href='https://github.com/jquery/jquery/pull/" +
pull[ 1 ] + "'>#" + pull[ 1 ] + "</a>";
@ -30,7 +26,7 @@ module.exports = function( grunt ) {
testswarm.createClient( {
url: config.swarmUrl,
pollInterval: 10000,
timeout: 1000 * 60 * 30
timeout: timeout || 1000 * 60 * 30
} )
.addReporter( testswarm.reporters.cli )
.auth( {
@ -42,7 +38,7 @@ module.exports = function( grunt ) {
name: jobName,
runs: runs,
runMax: config.runMax,
browserSets: browserSets
browserSets: browserSets || [ "popular", "ios" ]
}, function( err, passed ) {
if ( err ) {
grunt.log.error( err );