[IMP] Cleanup + timeout

bzr revid: ddm@openerp.com-20131230142601-w9zamknj7h4qw9zh

addons/website/tests/ui_suite/banner_tour_test.js

@@ -32,6 +32,6 @@ testRunner.run(function testBannerTour (page) {
         }, function finish () {
             console.log('{ "event": "success" }');
             phantom.exit();
-        }, 25000);
-    }, 25000);
+        }, 30000);
+    }, 20000);
 });

addons/website/tests/ui_suite/simple_dom_test.js

@@ -10,15 +10,5 @@ testRunner.run(function simpleDomTest (page) {
     }, function success () {
         console.log('{ "event": "success" }');
         phantom.exit();
-    }, 20000, function errorStatus () {
-        var status = page.evaluate(function () {
-            return {
-                href: window.location.href,
-                jQueryFound: (typeof window.$ === 'function'),
-                openerpFound: (typeof window.openerp === 'object'),
-                websiteFound: (typeof window.openerp.website === 'object'),
-            }
-        });
-        return status.href+" - jQuery: "+status.jQueryFound+" - openerp: " +status.openerpFound+ " - website: "+status.websiteFound;
-    });
+    }, 20000);
 });

addons/website/tests/ui_suite/ui_test_runner.js

@@ -1,4 +1,4 @@
-function waitFor(ready, callback, timeout, timeoutMessageCallback) {
+function waitFor (ready, callback, timeout, timeoutMessageCallback) {
     timeout = timeout || 10000;
     var start = new Date().getTime();
     var condition = ready();