From 97e0e97c7aeb51ea2b18ba4f676faec2486c3e08 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 30 Dec 2013 15:26:01 +0100
Subject: [PATCH] [IMP] Cleanup + timeout

bzr revid: ddm@openerp.com-20131230142601-w9zamknj7h4qw9zh
---
 addons/website/tests/ui_suite/banner_tour_test.js |  4 ++--
 addons/website/tests/ui_suite/simple_dom_test.js  | 12 +-----------
 addons/website/tests/ui_suite/ui_test_runner.js   |  2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/addons/website/tests/ui_suite/banner_tour_test.js b/addons/website/tests/ui_suite/banner_tour_test.js
index 0d855a13e5c..4bbe25ccb19 100644
--- a/addons/website/tests/ui_suite/banner_tour_test.js
+++ b/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);
 });
\ No newline at end of file
diff --git a/addons/website/tests/ui_suite/simple_dom_test.js b/addons/website/tests/ui_suite/simple_dom_test.js
index 9d96b9cfd86..fab8623a594 100644
--- a/addons/website/tests/ui_suite/simple_dom_test.js
+++ b/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);
 });
\ No newline at end of file
diff --git a/addons/website/tests/ui_suite/ui_test_runner.js b/addons/website/tests/ui_suite/ui_test_runner.js
index a4a710fc81e..1b21f199b0e 100644
--- a/addons/website/tests/ui_suite/ui_test_runner.js
+++ b/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();