diff --git a/tests/dictionaries/01base_float/yml/00-base.yml b/tests/dictionaries/01base_float/yml/00-base.yml index 2027c0d75..bc1632254 100644 --- a/tests/dictionaries/01base_float/yml/00-base.yml +++ b/tests/dictionaries/01base_float/yml/00-base.yml @@ -8,11 +8,11 @@ variables: type: float description: Description value: - - text: '0.527' + - text: 0.527 - variable: name: float_multi type: float description: Description multi: true value: - - text: '0.527' + - text: 0.527 diff --git a/tests/dictionaries/01base_provider/yml/00-base.yml b/tests/dictionaries/01base_provider/yml/00-base.yml index 24c2591d5..09ac003dd 100644 --- a/tests/dictionaries/01base_provider/yml/00-base.yml +++ b/tests/dictionaries/01base_provider/yml/00-base.yml @@ -9,11 +9,11 @@ variables: description: Description provider: float value: - - text: '0.527' + - text: 0.527 - variable: name: float_multi type: float description: Description multi: true value: - - text: '0.527' + - text: 0.527 diff --git a/tests/dictionaries/01base_provider_hidden/yml/00-base.yml b/tests/dictionaries/01base_provider_hidden/yml/00-base.yml index 41cd4fffb..b1849321d 100644 --- a/tests/dictionaries/01base_provider_hidden/yml/00-base.yml +++ b/tests/dictionaries/01base_provider_hidden/yml/00-base.yml @@ -10,11 +10,11 @@ variables: provider: float hidden: true value: - - text: '0.527' + - text: 0.527 - variable: name: float_multi type: float description: Description multi: true value: - - text: '0.527' + - text: 0.527 diff --git a/tests/test_1_flattener.py b/tests/test_1_flattener.py index 44f0f85e6..de8bcbc4e 100644 --- a/tests/test_1_flattener.py +++ b/tests/test_1_flattener.py @@ -115,13 +115,25 @@ def xml_to_yaml(filename, destfilename): value = True elif value == 'False': value = False - try: - # if it's a number - nvalue = int(value) - assert str(nvalue) == value - value = nvalue - except: - pass + else: + converted = False + try: + # if it's a number + nvalue = int(value) + assert str(nvalue) == value + value = nvalue + converted = True + except: + pass + if not converted: + try: + # if it's a number + nvalue = float(value) + assert str(nvalue) == value + value = nvalue + converted = True + except: + pass if key.startswith('@'): # remove @ dico[key[1:]] = value @@ -134,7 +146,7 @@ def xml_to_yaml(filename, destfilename): dico[key] = value elif key == 'value': dico[key] = [{'text': value}] - elif isinstance(value, (str, bool, int)): + elif isinstance(value, (str, bool, int, float)): dico[key] = [{'text': value}] else: dico[key] = [value]