aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/tests/phantom.js6
-rw-r--r--js/tests/pid.txt1
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