From: Jacob Thornton Date: Mon, 23 Apr 2012 10:18:13 +0000 (-0700) Subject: increase length of waitfor timeout for phantom X-Git-Tag: v2.0.3~5^2~6^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c896a182e13b0e5d12a5c2104119d7b873b22162;p=thirdparty%2Fbootstrap.git increase length of waitfor timeout for phantom --- diff --git a/js/tests/phantom.js b/js/tests/phantom.js index 5173ba9a19..4105bf529d 100644 --- a/js/tests/phantom.js +++ b/js/tests/phantom.js @@ -2,15 +2,15 @@ // Adapted from Modernizr function waitFor(testFx, onReady, timeOutMillis) { - var maxtimeOutMillis = timeOutMillis ? timeOutMillis : 3001 //< Default Max Timout is 3s + var maxtimeOutMillis = timeOutMillis ? timeOutMillis : 5001 //< Default Max Timout is 5s , start = new Date().getTime() , condition = false - , interval = setInterval(function() { + , interval = setInterval(function () { if ((new Date().getTime() - start < maxtimeOutMillis) && !condition) { // If not time-out yet and condition not yet fulfilled condition = (typeof(testFx) === "string" ? eval(testFx) : testFx()) //< defensive code } else { - if(!condition) { + if (!condition) { // If condition still not fulfilled (timeout but condition is 'false') console.log("'waitFor()' timeout") phantom.exit(1) diff --git a/js/tests/pid.txt b/js/tests/pid.txt new file mode 100644 index 0000000000..129f3d6210 --- /dev/null +++ b/js/tests/pid.txt @@ -0,0 +1 @@ +1520 \ No newline at end of file