[FIX] yaml_import: proper support of different value types for date[time] fields in yml tests
bzr revid: odo@openerp.com-20100917094100-uaebg1jbmtc3rwz8
This commit is contained in:
parent
1b914a32c5
commit
cd3692125f
|
@ -70,14 +70,16 @@ def is_url(node):
|
||||||
|
|
||||||
def is_eval(node):
|
def is_eval(node):
|
||||||
return isinstance(node, yaml_tag.Eval)
|
return isinstance(node, yaml_tag.Eval)
|
||||||
|
|
||||||
def is_ref(node):
|
def is_ref(node):
|
||||||
return isinstance(node, yaml_tag.Ref) \
|
return isinstance(node, yaml_tag.Ref) \
|
||||||
or _is_yaml_mapping(node, yaml_tag.Ref)
|
or _is_yaml_mapping(node, yaml_tag.Ref)
|
||||||
|
|
||||||
def is_ir_set(node):
|
def is_ir_set(node):
|
||||||
return _is_yaml_mapping(node, yaml_tag.IrSet)
|
return _is_yaml_mapping(node, yaml_tag.IrSet)
|
||||||
|
|
||||||
|
def is_string(node):
|
||||||
|
return isinstance(node, basestring)
|
||||||
|
|
||||||
class TestReport(object):
|
class TestReport(object):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
@ -374,12 +376,12 @@ class YamlInterpreter(object):
|
||||||
elif column._type == "many2many":
|
elif column._type == "many2many":
|
||||||
ids = [self.get_id(xml_id) for xml_id in expression]
|
ids = [self.get_id(xml_id) for xml_id in expression]
|
||||||
value = [(6, 0, ids)]
|
value = [(6, 0, ids)]
|
||||||
elif column._type == "date":
|
elif column._type == "date" and is_string(expression):
|
||||||
# enforce ISO format for date values, to be locale-agnostic during tests
|
# enforce ISO format for string date values, to be locale-agnostic during tests
|
||||||
time.strptime(expression, misc.DEFAULT_SERVER_DATE_FORMAT)
|
time.strptime(expression, misc.DEFAULT_SERVER_DATE_FORMAT)
|
||||||
value = expression
|
value = expression
|
||||||
elif column._type == "datetime":
|
elif column._type == "datetime" and is_string(expression):
|
||||||
# enforce ISO format for datetime values, to be locale-agnostic during tests
|
# enforce ISO format for string datetime values, to be locale-agnostic during tests
|
||||||
time.strptime(expression, misc.DEFAULT_SERVER_DATETIME_FORMAT)
|
time.strptime(expression, misc.DEFAULT_SERVER_DATETIME_FORMAT)
|
||||||
value = expression
|
value = expression
|
||||||
else: # scalar field
|
else: # scalar field
|
||||||
|
|
Loading…
Reference in New Issue