From 2e8c9a48e172de42c87aeeb3f5933f91f09e1e8e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 29 Apr 2013 14:23:17 +0200
Subject: [PATCH] [IMP] move testing of xml conversion alongside test data to
 ensure tests only run if module on addons_path/loaded

bzr revid: xmo@openerp.com-20130429122317-yzv4prie9hc7f7l6
---
 openerp/tests/__init__.py                                   | 2 --
 openerp/tests/addons/test_convert/__init__.py               | 1 -
 openerp/tests/addons/test_convert/tests/__init__.py         | 6 ++++++
 .../tests/{ => addons/test_convert/tests}/test_convert.py   | 2 +-
 openerp/tools/convert.py                                    | 3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 openerp/tests/addons/test_convert/tests/__init__.py
 rename openerp/tests/{ => addons/test_convert/tests}/test_convert.py (98%)

diff --git a/openerp/tests/__init__.py b/openerp/tests/__init__.py
index 5f262374694..3d129e06924 100644
--- a/openerp/tests/__init__.py
+++ b/openerp/tests/__init__.py
@@ -21,7 +21,6 @@ import test_osv
 import test_translate
 import test_uninstall
 import test_view_validation
-import test_convert
 # This need a change in `oe run-tests` to only run fast_suite + checks by default.
 # import test_xmlrpc
 
@@ -42,7 +41,6 @@ checks = [
     test_misc,
     test_osv,
     test_translate,
-    test_convert,
 ]
  
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tests/addons/test_convert/__init__.py b/openerp/tests/addons/test_convert/__init__.py
index 40a96afc6ff..e69de29bb2d 100644
--- a/openerp/tests/addons/test_convert/__init__.py
+++ b/openerp/tests/addons/test_convert/__init__.py
@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-
diff --git a/openerp/tests/addons/test_convert/tests/__init__.py b/openerp/tests/addons/test_convert/tests/__init__.py
new file mode 100644
index 00000000000..002a0a18d1a
--- /dev/null
+++ b/openerp/tests/addons/test_convert/tests/__init__.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+from . import test_convert
+
+checks = [
+    test_convert
+]
diff --git a/openerp/tests/test_convert.py b/openerp/tests/addons/test_convert/tests/test_convert.py
similarity index 98%
rename from openerp/tests/test_convert.py
rename to openerp/tests/addons/test_convert/tests/test_convert.py
index 87c3000fba9..50d7df4b665 100644
--- a/openerp/tests/test_convert.py
+++ b/openerp/tests/addons/test_convert/tests/test_convert.py
@@ -3,7 +3,7 @@ import unittest2
 from lxml import etree as ET
 from lxml.builder import E
 
-from . import common
+from openerp.tests import common
 
 from openerp.tools.convert import _eval_xml
 
diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index 8541550a6d5..09ba6b98bad 100644
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -165,7 +165,8 @@ def _eval_xml(self, node, pool, cr, uid, idref, context=None):
             from ..modules import module
             path = node.text.strip()
             if not module.get_module_resource(self.module, path):
-                raise IOError("No such file or directory: '%s'" % path)
+                raise IOError("No such file or directory: '%s' in %s" % (
+                    path, self.module))
             return '%s,%s' % (self.module, path)
         if t in ('char', 'int', 'float'):
             d = node.text