diff options
| author | Jacob Thornton <[email protected]> | 2012-04-23 03:18:13 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-04-23 03:18:13 -0700 |
| commit | c896a182e13b0e5d12a5c2104119d7b873b22162 (patch) | |
| tree | af8bd574c1cf59b9831ca8f903228d3d08c64876 | |
| parent | 091a97c01c0dd9e725e42c6a1a6a19a74054d587 (diff) | |
| download | bootstrap-c896a182e13b0e5d12a5c2104119d7b873b22162.tar.xz bootstrap-c896a182e13b0e5d12a5c2104119d7b873b22162.zip | |
increase length of waitfor timeout for phantom
| -rw-r--r-- | js/tests/phantom.js | 6 | ||||
| -rw-r--r-- | js/tests/pid.txt | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/js/tests/phantom.js b/js/tests/phantom.js index 5173ba9a1..4105bf529 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 000000000..129f3d621 --- /dev/null +++ b/js/tests/pid.txt @@ -0,0 +1 @@ +1520
\ No newline at end of file |