Skip to content

Commit

Permalink
Merge pull request #613 from JulienBortolussiAda/disable_name_generat…
Browse files Browse the repository at this point in the history
…or_for_source

Do not use the name generator in source mode
  • Loading branch information
Nikokrock authored Aug 1, 2023
2 parents 229302d + 750ad85 commit e34d243
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/e3/anod/spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ def __init__(

# Create the QualifiersManager.
# Skip if the name generator is disabled.
if self.enable_name_generator:
if self.enable_name_generator and self.kind != "source":
self.qualifiers_manager = QualifiersManager(self)
self.declare_qualifiers_and_components(self.qualifiers_manager)
self.qualifiers_manager.parse(self.parsed_qualifier)
Expand Down Expand Up @@ -322,7 +322,7 @@ def build_space_name(self) -> str:
build_space name otherwise.
:rtype: str | None
"""
if self.enable_name_generator:
if self.enable_name_generator and self.kind != "source":
return self.qualifiers_manager.build_space_name
else:
return self.name
Expand Down
10 changes: 10 additions & 0 deletions tests/tests_e3/anod/test_qualifier_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -417,3 +417,13 @@ def declare_qualifiers_and_components(self, qualifiers_manager):
qualifiers_manager = QualifiersManager(Anod("", kind="build"))
qualifiers_manager.parse({})
qualifiers_manager.parse({})


def test_qualifiers_with_source_primitive():
class SimpleAnod(Anod):
enable_name_generator = True
base_name = "simple"
name = "simple_anod"

simple_anod = SimpleAnod(kind="source", qualifier="")
assert simple_anod.build_space_name == "simple_anod"

0 comments on commit e34d243

Please sign in to comment.