odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] yaml import: log as TEST only for test files 

bzr revid: chs@openerp.com-20120822101156-v5w2kljumas2cyq0
This commit is contained in:
Christophe Simonis 2012-08-22 12:11:56 +02:00
parent 16dc736b23
commit 610c8d8078
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openerp-server
View File

@ -105,7 +105,7 @@ def run_test_file(dbname, test_file):
db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False) db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False)
cr = db.cursor() cr = db.cursor()
_logger.info('loading test file %s', test_file) _logger.info('loading test file %s', test_file)
openerp.tools.convert_yaml_import(cr, 'base', file(test_file), {}, 'test', True) openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'test', True)
cr.rollback() cr.rollback()
cr.close() cr.close()
except Exception: except Exception:

6
openerp/modules/loading.py
View File

@ -3,7 +3,7 @@
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
# Copyright (C) 2010-2011 OpenERP s.a. (<http://openerp.com>). # Copyright (C) 2010-2012 OpenERP s.a. (<http://openerp.com>).
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as # it under the terms of the GNU Affero General Public License as
@ -84,7 +84,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
_load_data(cr, module_name, idref, mode, 'test') _load_data(cr, module_name, idref, mode, 'test')
return True return True
except Exception: except Exception:
_logger.error( _logger.exception(
'module %s: an exception occurred in a test', module_name) 'module %s: an exception occurred in a test', module_name)
return False return False
finally: finally:
@ -119,7 +119,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
elif ext == '.sql': elif ext == '.sql':
process_sql_file(cr, fp) process_sql_file(cr, fp)
elif ext == '.yml': elif ext == '.yml':
tools.convert_yaml_import(cr, module_name, fp, idref, mode, noupdate, report) tools.convert_yaml_import(cr, module_name, fp, kind, idref, mode, noupdate, report)
else: else:
tools.convert_xml_import(cr, module_name, fp, idref, mode, noupdate, report) tools.convert_xml_import(cr, module_name, fp, idref, mode, noupdate, report)
finally: finally:

27
openerp/tools/yaml_import.py
View File

@ -100,7 +100,7 @@ class RecordDictWrapper(dict):
return dict.__getitem__(self, key) return dict.__getitem__(self, key)
class YamlInterpreter(object): class YamlInterpreter(object):
def __init__(self, cr, module, id_map, mode, filename, report=None, noupdate=False): def __init__(self, cr, module, id_map, mode, filename, report=None, noupdate=False, loglevel=logging.DEBUG):
self.cr = cr self.cr = cr
self.module = module self.module = module
self.id_map = id_map self.id_map = id_map
@ -110,6 +110,7 @@ class YamlInterpreter(object):
report = assertion_report.assertion_report() report = assertion_report.assertion_report()
self.assertion_report = report self.assertion_report = report
self.noupdate = noupdate self.noupdate = noupdate
self.loglevel = loglevel
self.pool = pooler.get_pool(cr.dbname) self.pool = pooler.get_pool(cr.dbname)
self.uid = 1 self.uid = 1
self.context = {} # opererp context self.context = {} # opererp context
@ -119,6 +120,9 @@ class YamlInterpreter(object):
'datetime': datetime, 'datetime': datetime,
'timedelta': timedelta} 'timedelta': timedelta}
def _log(self, *args, **kwargs):
_logger.log(self.loglevel, *args, **kwargs)
def _ref(self): def _ref(self):
return lambda xml_id: self.get_id(xml_id) return lambda xml_id: self.get_id(xml_id)
@ -484,12 +488,10 @@ class YamlInterpreter(object):
self.noupdate = node.noupdate self.noupdate = node.noupdate
def process_python(self, node): def process_python(self, node):
def log(msg, *args):
_logger.log(logging.TEST, msg, *args)
python, statements = node.items()[0] python, statements = node.items()[0]
model = self.get_model(python.model) model = self.get_model(python.model)
statements = statements.replace("\r\n", "\n") statements = statements.replace("\r\n", "\n")
code_context = {'model': model, 'cr': self.cr, 'uid': self.uid, 'log': log, 'context': self.context} code_context = {'model': model, 'cr': self.cr, 'uid': self.uid, 'log': self._log, 'context': self.context}
code_context.update({'self': model}) # remove me when no !python block test uses 'self' anymore code_context.update({'self': model}) # remove me when no !python block test uses 'self' anymore
try: try:
code_obj = compile(statements, self.filename, 'exec') code_obj = compile(statements, self.filename, 'exec')
@ -720,7 +722,7 @@ class YamlInterpreter(object):
if len(ids): if len(ids):
self.pool.get(node.model).unlink(self.cr, self.uid, ids) self.pool.get(node.model).unlink(self.cr, self.uid, ids)
else: else:
_logger.log(logging.TEST, "Record not deleted.") self._log("Record not deleted.")
def process_url(self, node): def process_url(self, node):
self.validate_xml_id(node.id) self.validate_xml_id(node.id)
@ -805,7 +807,7 @@ class YamlInterpreter(object):
is_preceded_by_comment = False is_preceded_by_comment = False
for node in yaml.load(yaml_string): for node in yaml.load(yaml_string):
is_preceded_by_comment = self._log(node, is_preceded_by_comment) is_preceded_by_comment = self._log_node(node, is_preceded_by_comment)
try: try:
self._process_node(node) self._process_node(node)
except YamlImportException, e: except YamlImportException, e:
@ -852,26 +854,27 @@ class YamlInterpreter(object):
else: else:
raise YamlImportException("Can not process YAML block: %s" % node) raise YamlImportException("Can not process YAML block: %s" % node)
def _log(self, node, is_preceded_by_comment): def _log_node(self, node, is_preceded_by_comment):
if is_comment(node): if is_comment(node):
is_preceded_by_comment = True is_preceded_by_comment = True
_logger.log(logging.TEST, node) self._log(node)
elif not is_preceded_by_comment: elif not is_preceded_by_comment:
if isinstance(node, types.DictionaryType): if isinstance(node, types.DictionaryType):
msg = "Creating %s\n with %s" msg = "Creating %s\n with %s"
args = node.items()[0] args = node.items()[0]
_logger.log(logging.TEST, msg, *args) self._log(msg, *args)
else: else:
_logger.log(logging.TEST, node) self._log(node)
else: else:
is_preceded_by_comment = False is_preceded_by_comment = False
return is_preceded_by_comment return is_preceded_by_comment
def yaml_import(cr, module, yamlfile, idref=None, mode='init', noupdate=False, report=None): def yaml_import(cr, module, yamlfile, kind, idref=None, mode='init', noupdate=False, report=None):
if idref is None: if idref is None:
idref = {} idref = {}
loglevel = logging.TEST if kind == 'test' else logging.DEBUG
yaml_string = yamlfile.read() yaml_string = yamlfile.read()
yaml_interpreter = YamlInterpreter(cr, module, idref, mode, filename=yamlfile.name, report=report, noupdate=noupdate) yaml_interpreter = YamlInterpreter(cr, module, idref, mode, filename=yamlfile.name, report=report, noupdate=noupdate, loglevel=loglevel)
yaml_interpreter.process(yaml_string) yaml_interpreter.process(yaml_string)
# keeps convention of convert.py # keeps convention of convert.py