From 61c82f28a4f1e903be53ec6355938d178b2c79a9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 18 Feb 2014 17:03:39 +0100
Subject: [PATCH] [FIX] imports, use @expectedFailure, simplify some inject
 specs

bzr revid: xmo@openerp.com-20140218160339-2r34z4ks2o4lriu5
---
 addons/website/tests/test_ui.py            |  6 ++++--
 addons/website_blog/tests/test_ui.py       |  2 +-
 addons/website_event/tests/test_ui.py      |  2 +-
 addons/website_event_sale/tests/test_ui.py |  2 +-
 addons/website_sale/tests/test_ui.py       | 14 +++++++-------
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index 7869479c483..244e991442c 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -4,9 +4,11 @@ import unittest2
 
 import openerp.tests
 
+relfile = lambda *args: os.path.join(os.path.dirname(__file__), *args)
+
 inject = [
-    ("openerp.website.Tour", os.path.join(os.path.dirname(__file__), '../static/src/js/website.tour.js')),
-    ("openerp.website.Tour.LoginEdit", os.path.join(os.path.dirname(__file__), "../static/src/js/website.tour.test.admin.js")),
+    ('openerp.website.Tour', relfile('../static/src/js/website.tour.js')),
+    ('openerp.website.Tour.LoginEdit', relfile('../static/src/js/website.tour.test.admin.js')),
 ]
 
 class TestUi(openerp.tests.HttpCase):
diff --git a/addons/website_blog/tests/test_ui.py b/addons/website_blog/tests/test_ui.py
index 8a99cf78782..e99884ba4b1 100644
--- a/addons/website_blog/tests/test_ui.py
+++ b/addons/website_blog/tests/test_ui.py
@@ -1,4 +1,4 @@
-import openerp
+import openerp.tests
 
 class TestUi(openerp.tests.HttpCase):
     def test_admin(self):
diff --git a/addons/website_event/tests/test_ui.py b/addons/website_event/tests/test_ui.py
index fb6825b9a56..c4e884c0325 100644
--- a/addons/website_event/tests/test_ui.py
+++ b/addons/website_event/tests/test_ui.py
@@ -1,4 +1,4 @@
-import openerp
+import openerp.tests
 
 class TestUi(openerp.tests.HttpCase):
     def test_admin(self):
diff --git a/addons/website_event_sale/tests/test_ui.py b/addons/website_event_sale/tests/test_ui.py
index f9a8ff8d4b3..6405bbd4cbf 100644
--- a/addons/website_event_sale/tests/test_ui.py
+++ b/addons/website_event_sale/tests/test_ui.py
@@ -1,4 +1,4 @@
-import openerp
+import openerp.tests
 
 inject = [
     "./../../../website/static/src/js/website.tour.test.js",
diff --git a/addons/website_sale/tests/test_ui.py b/addons/website_sale/tests/test_ui.py
index 294218579cf..94af9d99846 100644
--- a/addons/website_sale/tests/test_ui.py
+++ b/addons/website_sale/tests/test_ui.py
@@ -1,6 +1,8 @@
 import os
 
-import openerp
+import unittest2
+
+import openerp.tests
 
 inject = [
     ("openerp.website.Tour", os.path.join(os.path.dirname(__file__), '../../website/static/src/js/website.tour.js')),
@@ -8,21 +10,19 @@ inject = [
 ]
 
 class TestUi(openerp.tests.HttpCase):
+    @unittest2.expectedFailure
     def test_01_admin_shop_tour(self):
-        # Works locally probably due to a race condition on openerp.website.Tour.Shop
-        # object should only be define once ready
-        return
         self.phantom_js("/", "openerp.website.Tour.run_test('shop')", "openerp.website.Tour.Shop", login="admin")
 
+    @unittest2.expectedFailure
     def test_02_admin_checkout(self):
-        return
         self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour", login="admin")
 
+    @unittest2.expectedFailure
     def test_03_demo_checkout(self):
-        return
         self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", login="demo", inject=inject)
 
+    @unittest2.expectedFailure
     def test_04_public_checkout(self):
-        return
         self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", inject=inject)