From ac68581e2eaf48ff324027ba9646756d5cbcf46e Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 9 Feb 2014 15:33:26 +0100
Subject: [PATCH] [FIX] re-enable test func and qweb

bzr revid: al@openerp.com-20140209143326-mitb5g9sdsll9arj
---
 openerp/addons/base/tests/__init__.py  | 26 ++++++++++++++------------
 openerp/addons/base/tests/test_func.py |  2 +-
 openerp/addons/base/tests/test_mail.py |  0
 openerp/addons/base/tests/test_qweb.py |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)
 mode change 100755 => 100644 openerp/addons/base/tests/test_mail.py

diff --git a/openerp/addons/base/tests/__init__.py b/openerp/addons/base/tests/__init__.py
index e3053285db6..29e1040beba 100644
--- a/openerp/addons/base/tests/__init__.py
+++ b/openerp/addons/base/tests/__init__.py
@@ -1,25 +1,27 @@
 import test_acl
+import test_base
 import test_basecase
 import test_db_cursor
 import test_expression
-import test_fields
-import test_ir_filters
-import test_ir_sequence
-import test_mail
-import test_orm
-import test_osv
-import test_translate
-#import test_uninstall
-import test_view_validation
-import test_xmlrpc
-import test_base
 import test_expression
+import test_fields
+import test_func
 import test_ir_actions
 import test_ir_attachment
+import test_ir_filters
+import test_ir_sequence
 import test_ir_values
+import test_mail
 import test_menu
+import test_orm
+import test_osv
+import test_phantom
+import test_qweb
 import test_res_config
 import test_res_lang
 import test_search
+import test_translate
+#import test_uninstall
+import test_view_validation
 import test_views
-import test_phantom
+import test_xmlrpc
diff --git a/openerp/addons/base/tests/test_func.py b/openerp/addons/base/tests/test_func.py
index 7bb2e8fdf07..e6dfab20825 100644
--- a/openerp/addons/base/tests/test_func.py
+++ b/openerp/addons/base/tests/test_func.py
@@ -2,7 +2,7 @@
 import functools
 import unittest2
 
-from ..tools.func import compose
+from openerp.tools.func import compose
 
 class TestCompose(unittest2.TestCase):
     def test_basic(self):
diff --git a/openerp/addons/base/tests/test_mail.py b/openerp/addons/base/tests/test_mail.py
old mode 100755
new mode 100644
diff --git a/openerp/addons/base/tests/test_qweb.py b/openerp/addons/base/tests/test_qweb.py
index 48e8dc377c5..71beaab605a 100644
--- a/openerp/addons/base/tests/test_qweb.py
+++ b/openerp/addons/base/tests/test_qweb.py
@@ -2,7 +2,7 @@
 import cgi
 from xml.dom import minidom as dom
 
-import common
+from openerp.tests import common
 from openerp.addons.base.ir import ir_qweb
 
 impl = dom.getDOMImplementation()