Vo Minh Thu (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-impex-tests-vmt into
lp:~openerp-dev/openobject-server/trunk-impex-tests-xmo.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-impex-tests-vmt/+merge/118570
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-impex-tests-vmt/+merge/118570
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-server/trunk-impex-tests-vmt into
lp:~openerp-dev/openobject-server/trunk-impex-tests-xmo.
=== modified file 'openerp/tests/__init__.py'
--- openerp/tests/__init__.py 2012-07-30 11:11:05 +0000
+++ openerp/tests/__init__.py 2012-08-07 14:36:21 +0000
@@ -9,7 +9,7 @@
"""
from . import test_expression, test_ir_sequence, test_orm,\
- test_uninstall, test_export, test_import
+ test_uninstall
fast_suite = [
test_ir_sequence,
@@ -18,8 +18,6 @@
checks = [
test_expression,
test_orm,
- test_export,
- test_import,
]
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added directory 'openerp/tests/addons/test_impex'
=== added file 'openerp/tests/addons/test_impex/__init__.py'
--- openerp/tests/addons/test_impex/__init__.py 1970-01-01 00:00:00 +0000
+++ openerp/tests/addons/test_impex/__init__.py 2012-08-07 14:36:21 +0000
@@ -0,0 +1,1 @@
+import models
=== added file 'openerp/tests/addons/test_impex/__openerp__.py'
--- openerp/tests/addons/test_impex/__openerp__.py 1970-01-01 00:00:00 +0000
+++ openerp/tests/addons/test_impex/__openerp__.py 2012-08-07 14:36:21 +0000
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+{
+ 'name': 'test-import-export',
+ 'version': '0.1',
+ 'category': 'Tests',
+ 'description': """A module to test import/export.""",
+ 'author': 'OpenERP SA',
+ 'maintainer': 'OpenERP SA',
+ 'website': 'http://www.openerp.com',
+ 'depends': ['base'],
+ 'data': [],
+ 'installable': True,
+ 'auto_install': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== renamed file 'openerp/tests/export_models.py' => 'openerp/tests/addons/test_impex/models.py'
--- openerp/tests/export_models.py 2012-07-31 13:54:49 +0000
+++ openerp/tests/addons/test_impex/models.py 2012-08-07 14:36:21 +0000
@@ -34,7 +34,6 @@
for name, field in models:
attrs = {
'_name': 'export.%s' % name,
- '_module': 'base',
'_columns': {
'const': fields.integer(),
'value': field
@@ -57,7 +56,6 @@
class One2ManyChild(orm.Model):
_name = 'export.one2many.child'
- _module = 'base'
# FIXME: orm.py:1161, fix to name_get on m2o field
_rec_name = 'value'
@@ -72,7 +70,6 @@
class One2ManyMultiple(orm.Model):
_name = 'export.one2many.multiple'
- _module = 'base'
_columns = {
'const': fields.integer(),
@@ -83,7 +80,6 @@
class One2ManyChildMultiple(orm.Model):
_name = 'export.one2many.multiple.child'
- _module = 'base'
# FIXME: orm.py:1161, fix to name_get on m2o field
_rec_name = 'value'
@@ -97,16 +93,13 @@
for record in self.browse(cr, uid, ids, context=context)]
class One2ManyChild1(orm.Model):
_name = 'export.one2many.child.1'
- _module = 'base'
_inherit = 'export.one2many.multiple.child'
class One2ManyChild2(orm.Model):
_name = 'export.one2many.child.2'
- _module = 'base'
_inherit = 'export.one2many.multiple.child'
class Many2ManyChild(orm.Model):
_name = 'export.many2many.other'
- _module = 'base'
# FIXME: orm.py:1161, fix to name_get on m2o field
_rec_name = 'value'
=== added directory 'openerp/tests/addons/test_impex/tests'
=== added file 'openerp/tests/addons/test_impex/tests/__init__.py'
--- openerp/tests/addons/test_impex/tests/__init__.py 1970-01-01 00:00:00 +0000
+++ openerp/tests/addons/test_impex/tests/__init__.py 2012-08-07 14:36:21 +0000
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+from . import test_export, test_import
+
+fast_suite = [
+]
+
+checks = [
+ test_export,
+ test_import,
+]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== renamed file 'openerp/tests/test_export.py' => 'openerp/tests/addons/test_impex/tests/test_export.py'
--- openerp/tests/test_export.py 2012-08-06 13:02:20 +0000
+++ openerp/tests/addons/test_impex/tests/test_export.py 2012-08-07 14:36:21 +0000
@@ -3,13 +3,11 @@
import openerp.modules.registry
import openerp
-from . import common, export_models
+from openerp.tests import common
def setUpModule():
openerp.tools.config['update'] = {'base': 1}
- openerp.modules.registry.RegistryManager.new(
- common.DB, update_module=True)
class CreatorCase(common.TransactionCase):
model_name = False
=== renamed file 'openerp/tests/test_import.py' => 'openerp/tests/addons/test_impex/tests/test_import.py'
--- openerp/tests/test_import.py 2012-08-01 09:44:34 +0000
+++ openerp/tests/addons/test_impex/tests/test_import.py 2012-08-07 14:36:21 +0000
@@ -2,7 +2,7 @@
import openerp.modules.registry
import openerp
-from . import common, export_models
+from openerp.tests import common
def ok(n):
""" Successful import of ``n`` records
@@ -28,8 +28,6 @@
def setupModule():
openerp.tools.config['update'] = {'base': 1}
- openerp.modules.registry.RegistryManager.new(
- common.DB, update_module=True)
class ImporterCase(common.TransactionCase):
model_name = False
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
