From 2227438899c9c0fd1cae6308b59f25fe9ad7868a Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sat, 4 Jan 2025 11:44:09 +0100 Subject: [PATCH] fix: remove prefix_path --- src/rougail/output_formatter/__init__.py | 4 ++-- .../16_6exists_family/rougail/00-test.yml | 7 +++++++ .../20_9family_absolute/rougail/00-base.yml | 21 +++++++++++++------ tests/test_load.py | 4 ++-- 4 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 tests/results/16_6exists_family/rougail/00-test.yml diff --git a/src/rougail/output_formatter/__init__.py b/src/rougail/output_formatter/__init__.py index e134a95..2112c2f 100644 --- a/src/rougail/output_formatter/__init__.py +++ b/src/rougail/output_formatter/__init__.py @@ -159,7 +159,7 @@ class RougailOutputFormatter: else: attributes = self.families_attributes for attr, default_value in attributes.items(): - if attr in ["name", "path", "namespace", "version", "path_prefix", "xmlfiles"]: + if attr in ["name", "path", "namespace", "version", "xmlfiles"]: continue try: value = getattr(obj, attr) @@ -204,7 +204,7 @@ class RougailOutputFormatter: multi = obj.multi or isinstance(obj.default, list) type_ = obj.type for attr, default_value in self.variables_attributes.items(): - if attr in ["name", "path", "namespace", "version", "path_prefix", "xmlfiles"]: + if attr in ["name", "path", "namespace", "version", "xmlfiles"]: continue try: value = getattr(obj, attr) diff --git a/tests/results/16_6exists_family/rougail/00-test.yml b/tests/results/16_6exists_family/rougail/00-test.yml new file mode 100644 index 0000000..3c06dc4 --- /dev/null +++ b/tests/results/16_6exists_family/rougail/00-test.yml @@ -0,0 +1,7 @@ +--- +version: 1.1 + +family: + exists: true + + variable: diff --git a/tests/results/20_9family_absolute/rougail/00-base.yml b/tests/results/20_9family_absolute/rougail/00-base.yml index 6c93659..cf99617 100644 --- a/tests/results/20_9family_absolute/rougail/00-base.yml +++ b/tests/results/20_9family_absolute/rougail/00-base.yml @@ -1,27 +1,36 @@ --- version: 1.1 -var1: # a variable +var1: # first variable family: # a family - var2: # a second variable + var2: + description: a second variable + test: + - string6 - subfamily: # a sub family + subfamily: # a sub family - variable: # a variable + variable: # third variable - variable: ___.var1 - variable: __.var2 family2: # a family var2: + description: a variable2 default: variable: __.family.var2 + var3: + test: + - string5 + default: string4 + subfamily: # a sub family - variable: # a variable + variable: # fourth variable - variable: ___.var1 - variable: ___.family.var2 - - variable: __.var2 + - variable: __.var3 diff --git a/tests/test_load.py b/tests/test_load.py index fddfb70..e5996ea 100644 --- a/tests/test_load.py +++ b/tests/test_load.py @@ -7,11 +7,11 @@ from rougail_tests.utils import get_structures_list, get_rougail_config, config_ excludes = [ -# "24_0family_hidden_condition_sub_family", +# "16_6exists_family", ] test_ok = get_structures_list(excludes) -# test_ok = [Path('../rougail-tests/structures/20_9family_absolute')] +# test_ok = [Path('../rougail-tests/structures/16_6exists_family')] def idfn(fixture_value):