From 2e1481c4335f38d140968cf6dca5aa6ac630e268 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Fri, 20 Feb 2015 04:42:29 +0000 Subject: [PATCH] Build: Use browserSets from testswarm config It's already in jQuery's Jenkins node-testswarm config (and set to the same value) but not used yet. Reference it to make sure it keeps working in the future. Closes gh-1452 (cherry picked from commit 1e7a1e811f7c9d624b2561ea3e2f34f80773ad0c) (cherry picked from commit 258dbe3ae481b74c056e6445bd1aaaface9d6c48) Conflicts: build/tasks/testswarm.js (cherry picked from commit 1d30b8051b4d92dcd42cd856a1fbcc24a1ec42d0) --- build/tasks/testswarm.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js index d724aafcc..558aac4e6 100644 --- a/build/tasks/testswarm.js +++ b/build/tasks/testswarm.js @@ -61,7 +61,8 @@ function submit( commit, runs, configFile, extra, done ) { name: "Commit " + commit.substr( 0, 10 ) + "" + extra, runs: runs, runMax: config.runMax, - browserSets: ["popular-ui"] + browserSets: config.browserSets, + timeout: 1000 * 60 * 30 }, function( error, passed ) { if ( error ) { grunt.log.error( error );