From 2a65b8156d79902ae95013622f55780fbfff3ad4 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Wed, 26 Apr 2017 19:36:10 +0200 Subject: [PATCH] [FIX] base: run defined modifiers tests --- openerp/addons/base/tests/test_views.py | 5 +++++ openerp/osv/orm.py | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/openerp/addons/base/tests/test_views.py b/openerp/addons/base/tests/test_views.py index bd297d2789c..027a2d9262c 100644 --- a/openerp/addons/base/tests/test_views.py +++ b/openerp/addons/base/tests/test_views.py @@ -9,6 +9,7 @@ from lxml.builder import E from psycopg2 import IntegrityError +from openerp.osv.orm import modifiers_tests from openerp.exceptions import ValidationError from openerp.tests import common import openerp.tools @@ -854,6 +855,10 @@ class test_views(ViewCase): string="Replacement title", version="7.0" )) + def test_modifiers(self): + # implemeted elsewhere... + modifiers_tests() + class ViewModeField(ViewCase): """ This should probably, eventually, be folded back into other test case diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 835e29da7f9..be5c69d9a01 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -118,13 +118,13 @@ def test_modifiers(what, expected): node = etree.fromstring(what) transfer_node_to_modifiers(node, modifiers) simplify_modifiers(modifiers) - json = simplejson.dumps(modifiers) - assert json == expected, "%s != %s" % (json, expected) + dumped = simplejson.dumps(modifiers) + assert dumped == expected, "%s != %s" % (dumped, expected) elif isinstance(what, dict): transfer_field_to_modifiers(what, modifiers) simplify_modifiers(modifiers) - json = simplejson.dumps(modifiers) - assert json == expected, "%s != %s" % (json, expected) + dumped = simplejson.dumps(modifiers) + assert dumped == expected, "%s != %s" % (dumped, expected) # To use this test: