From e5d67ad2e0f5c63875d44a4b921313739d3892cb Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 7 Oct 2013 11:33:28 +0200 Subject: [PATCH] [REM] broken tests expectation of view validation errors when creating view referencing non-existent fields or models, but in website branch models and views have become independents, these are not context-free errors anymore. Also fix shit code. bzr revid: xmo@openerp.com-20131007093328-gjrktqbsoe48ikol --- openerp/addons/base/tests/test_views.py | 79 ++++--------------------- 1 file changed, 13 insertions(+), 66 deletions(-) diff --git a/openerp/addons/base/tests/test_views.py b/openerp/addons/base/tests/test_views.py index 2db39e510f1..6d09147fa1a 100644 --- a/openerp/addons/base/tests/test_views.py +++ b/openerp/addons/base/tests/test_views.py @@ -430,40 +430,6 @@ class TestNoModel(common.TransactionCase): class test_views(common.TransactionCase): - - @mute_logger('openerp.osv.orm', 'openerp.addons.base.ir.ir_ui_view') - def test_00_init_check_views(self): - Views = self.registry('ir.ui.view') - - self.assertTrue(Views.pool._init) - - error_msg = "The model name does not exist or the view architecture cannot be rendered" - # test arch check is call for views without xmlid during registry initialization - with self.assertRaisesRegexp(except_orm, error_msg): - Views.create(self.cr, self.uid, { - 'name': 'Test View #1', - 'model': 'ir.ui.view', - 'arch': """ - - - - """, - }) - - # same for inherited views - with self.assertRaisesRegexp(except_orm, error_msg): - # Views.pudb = True - Views.create(self.cr, self.uid, { - 'name': 'Test View #2', - 'model': 'ir.ui.view', - 'inherit_id': self.browse_ref('base.view_view_tree').id, - 'arch': """ - - - - """, - }) - def _insert_view(self, **kw): """Insert view into database via a query to passtrough validation""" kw.pop('id', None) @@ -483,47 +449,28 @@ class test_views(common.TransactionCase): validate = partial(Views._validate_custom_views, self.cr, self.uid, model) # validation of a single view - vid = self._insert_view(**{ - 'name': 'base view', - 'model': model, - 'priority': 1, - 'arch': """ + vid = self._insert_view( + name='base view', + model=model, + priority=1, + arch=""" """, - }) + ) self.assertTrue(validate()) # single view # validation of a inherited view - self._insert_view(**{ - 'name': 'inherited view', - 'model': model, - 'priority': 1, - 'inherit_id': vid, - 'arch': """ + self._insert_view( + name='inherited view', + model=model, + priority=1, + inherit_id=vid, + arch=""" """, - }) + ) self.assertTrue(validate()) # inherited view - - # validation of a bad inherited view - self._insert_view(**{ - 'name': 'bad inherited view', - 'model': model, - 'priority': 2, - 'inherit_id': vid, - 'arch': """ - - - - """, - }) - with mute_logger('openerp.osv.orm', 'openerp.addons.base.ir.ir_ui_view'): - self.assertFalse(validate()) # bad inherited view - - -if __name__ == '__main__': - unittest2.main()