[MERGE] Merge parents

bzr revid: rim@openerp.com-20131230101509-6pl32yp5cboay06r

addons/website/tests/test_ui.py

@@ -43,7 +43,7 @@ class WebsiteUiTest(unittest.TestCase):
 
 class WebsiteUiSuite(unittest.TestSuite):
     # timeout in seconds
-    def __init__(self, testfile, options, timeout=20.0):
+    def __init__(self, testfile, options, timeout=60.0):
         self._testfile = testfile
         self._timeout = timeout
         self._options = options

addons/website/tests/ui_suite/banner_tour_test.js

@@ -4,13 +4,13 @@ var waitFor = testRunner.waitFor;
 
 testRunner.run(function testBannerTour (page) {
     page.evaluate(function () { localStorage.clear(); });
-    waitFor(function () {
+    waitFor(function clientReady () {
         return page.evaluate(function () {
             return window.openerp && window.openerp.website
                 && window.openerp.website.TestConsole
                 && window.openerp.website.TestConsole.test('banner');
         });
-    }, function () {
+    }, function executeTest () {
         var before = page.evaluate(function () {
             var result = {
                 carousel: $('#wrap [data-snippet-id=carousel]').length,
@@ -19,7 +19,7 @@ testRunner.run(function testBannerTour (page) {
             window.openerp.website.TestConsole.test('banner').run(true);
             return result;
         });
-        waitFor(function () {
+        waitFor(function testExecuted () {
             var after = page.evaluate(function () {
                 if ($('button[data-action=edit]').is(":visible")) {
                     return {
@@ -29,9 +29,9 @@ testRunner.run(function testBannerTour (page) {
                 }
             });
             return after && after.carousel === before.carousel + 1 && after.columns === before.columns + 1;
-        }, function () {
+        }, function finish () {
             console.log('{ "event": "success" }');
             phantom.exit();
-        }, 15000);
-    }, 5000);
+        }, 25000);
+    }, 25000);
 });

addons/website/tests/ui_suite/ui_test_runner.js

@@ -42,8 +42,6 @@ function run (test) {
             console.log('{ "event": "error", "message": "'+url+' failed to load"}');
             phantom.exit(1);
         } else {
-            // TODO Remove
-            console.log('{ "event": "error", "message": "Testing '+url+'"}');
             test(page);
         }
     });