Improve macro name in error messages

Change-Id: Ib31b7953c22b3fbc23adda889aa3ff980313ec8c
2024-02-22 12:52:31 +03:00 · 2024-02-22 12:52:31 +03:00 · bb4fab9192
parent fb913725e2
commit bb4fab9192
15 changed files with 15 additions and 15 deletions
--- a/jenkins_jobs/macro.py
+++ b/jenkins_jobs/macro.py
@ -81,7 +81,7 @@ class Macro(ElementBase):
        roots.assign(roots.macros[type_name], name, macro, "macro")

    def __str__(self):
-        return f"macro {self.name!r}"
+        return f"{self._type_name} macro {self.name!r}"

    def dispatch_elements(self, registry, xml_parent, component_data, job_data, params):
        defaults = self._pick_defaults(self.defaults_name)
--- a/tests/yamlparser/error_fixtures/macro_error_context_for_builder.error
+++ b/tests/yamlparser/error_fixtures/macro_error_context_for_builder.error
@ -10,7 +10,7 @@ macro_error_context_for_builder.yaml:8:3: In job template 'sample-job'
 macro_error_context_for_builder.yaml:11:7: While expanding builder macro call 'sample-builder'
        - sample-builder:
          ^
-macro_error_context_for_builder.yaml:3:3: While expanding macro 'sample-builder'
+macro_error_context_for_builder.yaml:3:3: While expanding builder macro 'sample-builder'
    - builder:
      ^
 macro_error_context_for_builder.yaml:6:15: While formatting string 'echo {missing_parameter}': Missing parameter: 'missing_parameter'
--- a/tests/yamlparser/error_fixtures/macro_error_context_for_notification.error
+++ b/tests/yamlparser/error_fixtures/macro_error_context_for_notification.error
@ -10,7 +10,7 @@ macro_error_context_for_notification.yaml:9:3: In job template 'sample-job'
 macro_error_context_for_notification.yaml:13:7: While expanding notification macro call 'sample-notification'
        - sample-notification:
          ^
-macro_error_context_for_notification.yaml:3:3: While expanding macro 'sample-notification'
+macro_error_context_for_notification.yaml:3:3: While expanding notification macro 'sample-notification'
    - notification:
      ^
 macro_error_context_for_notification.yaml:7:15: While formatting string '{missing_parameter}': Missing parameter: 'missing_parameter'
--- a/tests/yamlparser/error_fixtures/macro_error_context_for_parameter.error
+++ b/tests/yamlparser/error_fixtures/macro_error_context_for_parameter.error
@ -10,7 +10,7 @@ macro_error_context_for_parameter.yaml:10:3: In job template 'sample-job'
 macro_error_context_for_parameter.yaml:13:7: While expanding parameter macro call 'sample-parameter'
        - sample-parameter:
          ^
-macro_error_context_for_parameter.yaml:3:3: While expanding macro 'sample-parameter'
+macro_error_context_for_parameter.yaml:3:3: While expanding parameter macro 'sample-parameter'
    - parameter:
      ^
 macro_error_context_for_parameter.yaml:8:19: While formatting string '{missing_parameter}': Missing parameter: 'missing_parameter'
--- a/tests/yamlparser/error_fixtures/macro_error_context_for_pipeline_scm.error
+++ b/tests/yamlparser/error_fixtures/macro_error_context_for_pipeline_scm.error
@ -10,7 +10,7 @@ macro_error_context_for_pipeline_scm.yaml:9:3: In job template 'sample-job'
 macro_error_context_for_pipeline_scm.yaml:14:9: While expanding scm macro call 'sample-scm'
          - sample-scm:
            ^
-macro_error_context_for_pipeline_scm.yaml:3:3: While expanding macro 'sample-scm'
+macro_error_context_for_pipeline_scm.yaml:3:3: While expanding scm macro 'sample-scm'
    - scm:
      ^
 macro_error_context_for_pipeline_scm.yaml:7:15: While formatting string '{missing_parameter}': Missing parameter: 'missing_parameter'
--- a/tests/yamlparser/error_fixtures/macro_error_context_for_property.error
+++ b/tests/yamlparser/error_fixtures/macro_error_context_for_property.error
@ -10,7 +10,7 @@ macro_error_context_for_property.yaml:9:3: In job template 'sample-job'
 macro_error_context_for_property.yaml:12:7: While expanding property macro call 'sample-property'
        - sample-property:
          ^
-macro_error_context_for_property.yaml:3:3: While expanding macro 'sample-property'
+macro_error_context_for_property.yaml:3:3: While expanding property macro 'sample-property'
    - property:
      ^
 macro_error_context_for_property.yaml:7:28: While formatting string '{missing_parameter}': Missing parameter: 'missing_parameter'
--- a/tests/yamlparser/error_fixtures/macro_error_context_for_publisher.error
+++ b/tests/yamlparser/error_fixtures/macro_error_context_for_publisher.error
@ -10,7 +10,7 @@ macro_error_context_for_publisher.yaml:9:3: In job template 'sample-job'
 macro_error_context_for_publisher.yaml:12:7: While expanding publisher macro call 'sample-publisher'
        - sample-publisher:
          ^
-macro_error_context_for_publisher.yaml:3:3: While expanding macro 'sample-publisher'
+macro_error_context_for_publisher.yaml:3:3: While expanding publisher macro 'sample-publisher'
    - publisher:
      ^
 macro_error_context_for_publisher.yaml:7:21: While formatting string '{missing_parameter}': Missing parameter: 'missing_parameter'
--- a/tests/yamlparser/error_fixtures/macro_error_context_for_reporter.error
+++ b/tests/yamlparser/error_fixtures/macro_error_context_for_reporter.error
@ -10,7 +10,7 @@ macro_error_context_for_reporter.yaml:9:3: In job template 'sample-job'
 macro_error_context_for_reporter.yaml:13:7: While expanding reporter macro call 'sample-reporter'
        - sample-reporter:
          ^
-macro_error_context_for_reporter.yaml:3:3: While expanding macro 'sample-reporter'
+macro_error_context_for_reporter.yaml:3:3: While expanding reporter macro 'sample-reporter'
    - reporter:
      ^
 macro_error_context_for_reporter.yaml:7:21: While formatting string '{missing_parameter}': Missing parameter: 'missing_parameter'
--- a/tests/yamlparser/error_fixtures/macro_error_context_for_scm.error
+++ b/tests/yamlparser/error_fixtures/macro_error_context_for_scm.error
@ -10,7 +10,7 @@ macro_error_context_for_scm.yaml:9:3: In job template 'sample-job'
 macro_error_context_for_scm.yaml:12:7: While expanding scm macro call 'sample-scm'
        - sample-scm:
          ^
-macro_error_context_for_scm.yaml:3:3: While expanding macro 'sample-scm'
+macro_error_context_for_scm.yaml:3:3: While expanding scm macro 'sample-scm'
    - scm:
      ^
 macro_error_context_for_scm.yaml:7:15: While formatting string '{missing_parameter}': Missing parameter: 'missing_parameter'
--- a/tests/yamlparser/error_fixtures/macro_error_context_for_trigger.error
+++ b/tests/yamlparser/error_fixtures/macro_error_context_for_trigger.error
@ -10,7 +10,7 @@ macro_error_context_for_trigger.yaml:9:3: In job template 'sample-job'
 macro_error_context_for_trigger.yaml:12:7: While expanding trigger macro call 'sample-trigger'
        - sample-trigger:
          ^
-macro_error_context_for_trigger.yaml:3:3: While expanding macro 'sample-trigger'
+macro_error_context_for_trigger.yaml:3:3: While expanding trigger macro 'sample-trigger'
    - trigger:
      ^
 macro_error_context_for_trigger.yaml:7:16: While formatting string '{missing_parameter}': Missing parameter: 'missing_parameter'
--- a/tests/yamlparser/error_fixtures/macro_error_context_for_wrapper.error
+++ b/tests/yamlparser/error_fixtures/macro_error_context_for_wrapper.error
@ -10,7 +10,7 @@ macro_error_context_for_wrapper.yaml:9:3: In job template 'sample-job'
 macro_error_context_for_wrapper.yaml:12:7: While expanding wrapper macro call 'sample-wrapper'
        - sample-wrapper:
          ^
-macro_error_context_for_wrapper.yaml:3:3: While expanding macro 'sample-wrapper'
+macro_error_context_for_wrapper.yaml:3:3: While expanding wrapper macro 'sample-wrapper'
    - wrapper:
      ^
 macro_error_context_for_wrapper.yaml:7:19: While formatting string '{missing_parameter}': Missing parameter: 'missing_parameter'
--- a/tests/yamlparser/error_fixtures/macro_with_null_params.error
+++ b/tests/yamlparser/error_fixtures/macro_with_null_params.error
@ -10,7 +10,7 @@ macro_with_null_params.yaml:8:3: In job template 'sample-job'
 macro_with_null_params.yaml:12:9: While expanding builder macro call 'sample-macro'
          - sample-macro:
            ^
-macro_with_null_params.yaml:1:3: While expanding macro 'sample-macro'
+macro_with_null_params.yaml:1:3: While expanding builder macro 'sample-macro'
    - builder:
      ^
 macro_with_null_params.yaml:6:17: While formatting string 'echo {hello}': Missing parameter: 'hello'
--- a/tests/yamlparser/error_fixtures/missing_defaults_at_macro.error
+++ b/tests/yamlparser/error_fixtures/missing_defaults_at_macro.error
@ -10,6 +10,6 @@ missing_defaults_at_macro.yaml:7:3: In job template 'sample-job'
 missing_defaults_at_macro.yaml:10:7: While expanding builder macro call 'sample-builder'
        - sample-builder
          ^
-missing_defaults_at_macro.yaml:3:15: Macro 'sample-builder' wants defaults 'missing-defaults', but it was never defined
+missing_defaults_at_macro.yaml:3:15: Builder macro 'sample-builder' wants defaults 'missing-defaults', but it was never defined
        defaults: missing-defaults
                  ^
--- a/tests/yamlparser/error_fixtures/missing_param_jinja2_macro_direct.error
+++ b/tests/yamlparser/error_fixtures/missing_param_jinja2_macro_direct.error
@ -10,7 +10,7 @@ missing_param_jinja2_macro_direct.yaml:12:3: In job template 'sample-job'
 missing_param_jinja2_macro_direct.yaml:15:9: While expanding builder macro call 'sample-builder'
          - sample-builder:
            ^
-missing_param_jinja2_macro_direct.yaml:6:3: While expanding macro 'sample-builder'
+missing_param_jinja2_macro_direct.yaml:6:3: While expanding builder macro 'sample-builder'
    - builder:
      ^
 missing_param_jinja2_macro_direct.yaml:9:16: While formatting jinja2 template 'echo {{ missing_param }} {{ other_param ...'
--- a/tests/yamlparser/error_fixtures/missing_param_simple_macro_direct.error
+++ b/tests/yamlparser/error_fixtures/missing_param_simple_macro_direct.error
@ -10,7 +10,7 @@ missing_param_simple_macro_direct.yaml:12:3: In job template 'sample-job'
 missing_param_simple_macro_direct.yaml:15:9: While expanding builder macro call 'sample-builder'
          - sample-builder:
            ^
-missing_param_simple_macro_direct.yaml:6:3: While expanding macro 'sample-builder'
+missing_param_simple_macro_direct.yaml:6:3: While expanding builder macro 'sample-builder'
    - builder:
      ^
 missing_param_simple_macro_direct.yaml:10:11: While formatting string 'echo {missing_param} {other_param}\n': Missing parameter: 'missing_param'