af9e03ec08
Rewrite YAML parser, YAML objects and parameters expansion logic to
enable better control over expansion logic.
Broken backward compatilibity:
* More agressive parameter expansion. This may lead to parameters
expanded in places where they were not expanded before.
* Top-level elements, which is not known to parser (such as 'job',
'view', 'project' etc), are now lead to parse failures.
Prepend them with underscore to be ignored by parser.
* Files included using '!include-raw:' elements and having formatting in
it's path ('lazy-loaded' in previous implementation) are now expanded
too.
Use '!include-raw-escape:' for them instead.
See changes in these tests for examples:
tests/yamlparser/job_fixtures/lazy-load-jobs-multi001.yaml
tests/yamlparser/job_fixtures/lazy-load-jobs-multi002.yaml
tests/yamlparser/job_fixtures/lazy-load-jobs001.yaml
* Parameters with template value using itself were substituted as is.
For example: "timer: '{timer}'" was expanded to "{timer}". Now it
leads to recursive parameter error.
See changes in this test for example:
tests/yamlparser/job_fixtures/parameter_name_reuse_default.*
->
tests/yamlparser/error_fixtures/parameter_name_reuse_default.*
* When job group includes a job which was never declared, it was just
ignored. Now it fails: job is missing.
See changes in this test for example:
tests/yamlparser/job_fixtures/job_group_includes_missing_job.*
->
tests/yamlparser/error_fixtures/job_group_includes_missing_job.*
Change-Id: Ief4e515f065a1b9e0f74fe06d7e94fa77d69f273
22 lines
591 B
Python
22 lines
591 B
Python
from unittest.mock import Mock
|
|
|
|
import pytest
|
|
|
|
from jenkins_jobs.config import JJBConfig
|
|
from jenkins_jobs.yaml_objects import J2String
|
|
|
|
|
|
cases = [
|
|
("{{ abc }}", {"abc"}),
|
|
("{% if cond %} {{ x }} {% else %} {{ y }} {% endif %}", {"cond", "x", "y"}),
|
|
("{# {{ abc }} #}", {}),
|
|
]
|
|
|
|
|
|
@pytest.mark.parametrize("format,expected_used_params", cases)
|
|
def test_jinja2_required_params(format, expected_used_params):
|
|
config = JJBConfig()
|
|
loader = Mock(source_path=None)
|
|
template = J2String(config, loader, format)
|
|
assert template.required_params == set(expected_used_params)
|