From 8ea56d266e935100e0225825cdd64d091d7d1983 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 27 Dec 2013 14:53:30 +0100
Subject: [PATCH] [IMP] UI tests code cleanup

bzr revid: ddm@openerp.com-20131227135330-z3815qyz4cjaf8zj
---
 addons/website/tests/test_ui.py                   | 8 ++------
 addons/website/tests/ui_suite/banner_tour_test.js | 1 -
 addons/website/tests/ui_suite/ui_test_runner.js   | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index ab936eb91d9..22c5f9643ad 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -119,9 +119,8 @@ class WebsiteUiSuite(unittest.TestSuite):
         # -------------
         # use console.log in phantomjs to output test results using the following format:
         # - for a success: { "event": "success" }
-        # - for a failure: { "event": "failure", "message": "Failure description" }
-        # - for an error:  { "event": "error",   "message": "Error description" }
-        # the first line is treated as a JSON messgae
+        # - for an error:  { "event": "error",   "message": "Short error description" }
+        # the first line is treated as a JSON message (JSON should be formatted on one line)
         # subsequent lines are displayed only if the first line indicated an error
         # or if the first line was not a JSON message (still an error)
         result.startTest(self._test)
@@ -130,9 +129,6 @@ class WebsiteUiSuite(unittest.TestSuite):
             event = args.get('event', None)
             if event == 'success':
                 result.addSuccess(self._test)
-            elif event == 'failure':
-                message = args.get('message', "")
-                result.addFailure(self._test, message)
             elif event == 'error':
                 message = args.get('message', "")
                 result.addError(self._test, message+"\n"+"\n".join(lines[1::]))
diff --git a/addons/website/tests/ui_suite/banner_tour_test.js b/addons/website/tests/ui_suite/banner_tour_test.js
index b25b80e79c4..162e2049e78 100644
--- a/addons/website/tests/ui_suite/banner_tour_test.js
+++ b/addons/website/tests/ui_suite/banner_tour_test.js
@@ -22,7 +22,6 @@ testRunner.run(function testBannerTour (page) {
         waitFor(function () {
             var after = page.evaluate(function () {
                 if ($('button[data-action=edit]').is(":visible")) {
-                    console.error("why?");
                     return {
                         carousel: $('#wrap [data-snippet-id=carousel]').length,
                         columns: $('#wrap [data-snippet-id=three-columns]').length,
diff --git a/addons/website/tests/ui_suite/ui_test_runner.js b/addons/website/tests/ui_suite/ui_test_runner.js
index e472579a0e8..7fff3530426 100644
--- a/addons/website/tests/ui_suite/ui_test_runner.js
+++ b/addons/website/tests/ui_suite/ui_test_runner.js
@@ -39,7 +39,7 @@ function run (test) {
     };
     page.open(url, function (status) {
         if (status !== 'success') {
-            console.log('{ "event": "failure", "message": "'+url+' failed to load"}');
+            console.log('{ "event": "error", "message": "'+url+' failed to load"}');
             phantom.exit(1);
         } else {
             test(page);