From 6b92807cd7a82795b4441b0bf4c236e1ffafd31a Mon Sep 17 00:00:00 2001 From: Vsevolod Fedorov Date: Wed, 18 Jan 2023 11:13:02 +0300 Subject: [PATCH] Tests: Rename yamlparser tests and fixture directories Rename fixtures directory to job_fixtures to prepare for adding view_fixtures directory in the following commits. Change-Id: Ic20997cae020b542ddc22bf444fa6b92fbcae064 --- doc/source/definition.rst | 28 +++++++++---------- doc/source/quick-start.rst | 6 ++-- jenkins_jobs/local_yaml.py | 18 ++++++------ jenkins_jobs/modules/builders.py | 4 +-- jenkins_jobs/modules/general.py | 2 +- jenkins_jobs/modules/parameters.py | 12 ++++---- jenkins_jobs/modules/project_flow.py | 6 ++-- jenkins_jobs/modules/project_folder.py | 4 +-- jenkins_jobs/modules/project_matrix.py | 2 +- jenkins_jobs/modules/project_pipeline.py | 10 +++---- jenkins_jobs/modules/project_workflow.py | 4 +-- .../failure_formatting_params.yaml | 0 .../failure_formatting_template.yaml | 0 .../incorrect_template_dimensions.yaml | 0 .../fixtures/include-raw-escape001.conf | 2 -- .../yamlparser/fixtures/include_path001.conf | 2 -- .../yamlparser/fixtures/include_path002.conf | 2 -- .../fixtures/lazy-load-jobs001.conf | 2 -- .../active-choices-param001.xml | 0 .../active-choices-param001.yaml | 0 .../active-choices-param002.xml | 0 .../active-choices-param002.yaml | 0 .../active-choices-param003.yaml | 0 .../active-choices-reactive-param001.xml | 0 .../active-choices-reactive-param001.yaml | 0 .../active-choices-reactive-param002.xml | 0 .../active-choices-reactive-param002.yaml | 0 .../add_managed_to_desc.xml | 0 .../add_managed_to_desc.yaml | 0 .../allow_empty_variables.conf | 0 .../allow_empty_variables.xml | 0 .../allow_empty_variables.yaml | 0 .../allow_empty_variables_include.conf | 0 .../allow_empty_variables_include.sh | 0 .../allow_empty_variables_include.xml | 0 .../allow_empty_variables_include.yaml | 0 ...project-in-folder-with-auth-properties.xml | 0 ...roject-in-folder-with-auth-properties2.xml | 0 .../complete-raw001.xml | 0 .../complete-raw001.yaml | 0 .../complete001.xml | 0 .../complete001.yaml | 0 .../concat_defaults001.xml | 0 .../concat_defaults001.yaml | 0 .../concat_defaults002.xml | 0 .../concat_defaults002.yaml | 0 .../critical_block_complete001.xml | 0 .../critical_block_complete001.yaml | 0 .../custom_distri.xml | 0 .../custom_distri.yaml | 0 .../default_template_variables_id_multi.xml | 0 .../default_template_variables_id_multi.yaml | 0 .../deprecated-include001.xml | 0 .../dont_overwrite_desc.conf | 0 .../dont_overwrite_desc.xml | 0 .../dont_overwrite_desc.yaml | 0 .../dynamic-reference-param001.xml | 0 .../dynamic-reference-param001.yaml | 0 .../dynamic-reference-param002.yaml | 0 .../dimensionality-test001.xml | 0 .../dimensionality-test001.yaml | 0 .../folders-attribute.yaml | 0 .../folders-job-name.yaml | 0 .../folders/folders001.xml | 0 .../{fixtures => job_fixtures}/folders001.xml | 0 .../folders001.yaml | 0 .../general-example-001.xml | 0 .../general-example-001.yaml | 0 ...ub_cancel_builds_on_update_variable001.xml | 0 ...b_cancel_builds_on_update_variable001.yaml | 0 ...ub_cancel_builds_on_update_variable002.xml | 0 ...b_cancel_builds_on_update_variable002.yaml | 0 .../hipchat1.plugins_info.yaml | 0 .../{fixtures => job_fixtures}/hipchat1.xml | 0 .../{fixtures => job_fixtures}/hipchat1.yaml | 0 .../include-raw-escape001-echo-vars.sh | 0 .../job_fixtures/include-raw-escape001.conf | 2 ++ .../include-raw-escape001.xml | 0 .../include-raw-escape001.yaml | 0 .../include-raw001.xml | 0 .../include-raw001.yaml | 0 .../include-raw002-cool.sh | 0 .../include-raw002-cool.zsh | 0 .../include-rawunicode001-cool.sh | 0 .../include-rawunicode001.xml | 0 .../include-rawunicode001.yaml | 0 .../{fixtures => job_fixtures}/include001.xml | 0 .../include001.yaml | 0 .../include001.yaml.inc | 0 .../job_fixtures/include_path001.conf | 2 ++ .../include_path001.xml | 0 .../include_path001.yaml | 0 .../job_fixtures/include_path002.conf | 2 ++ .../include_path002.xml | 0 .../include_path002.yaml | 0 .../jinja-include01.xml | 0 .../jinja-include01.yaml | 0 .../jinja-include01.yaml.inc | 0 .../jinja-include02.xml | 0 .../jinja-include02.yaml | 0 .../jinja-string01.xml | 0 .../jinja-string01.yaml | 0 .../jinja-string02.xml | 0 .../jinja-string02.yaml | 0 .../jinja-string03.xml | 0 .../jinja-string03.yaml | 0 .../jinja-string04.xml | 0 .../jinja-string04.yaml | 0 .../jinja-yaml01.xml | 0 .../jinja-yaml01.yaml | 0 .../jinja-yaml02.xml | 0 .../jinja-yaml02.yaml | 0 .../jinja-yaml03.groovy | 0 .../jinja-yaml03.xml | 0 .../jinja-yaml03.yaml | 0 .../jinja-yaml04-deepcopy.xml | 0 .../jinja-yaml04-deepcopy.yaml | 0 .../{fixtures => job_fixtures}/jinja01.xml | 0 .../{fixtures => job_fixtures}/jinja01.yaml | 0 .../jinja01.yaml.inc | 0 .../{fixtures => job_fixtures}/jinja02.xml | 0 .../{fixtures => job_fixtures}/jinja02.yaml | 0 .../jinja02.yaml.inc | 0 .../{fixtures => job_fixtures}/jinja03.xml | 0 .../{fixtures => job_fixtures}/jinja03.yaml | 0 .../jinja03.yaml.inc | 0 .../job-parameter-precedence.xml | 0 .../job-parameter-precedence.yaml | 0 .../jobgroups_multi_use.xml | 0 .../jobgroups_multi_use.yaml | 0 .../lazy-load-jinja001.xml | 0 .../lazy-load-jinja001.yaml | 0 .../lazy-load-jobs-copy-files.yaml.inc | 0 .../lazy-load-jobs-multi001.xml | 0 .../lazy-load-jobs-multi001.yaml | 0 .../lazy-load-jobs-multi002.xml | 0 .../lazy-load-jobs-multi002.yaml | 0 .../lazy-load-jobs-pre-scm-shell-ant.yaml.inc | 0 .../lazy-load-jobs-timeout.yaml.inc | 0 .../job_fixtures/lazy-load-jobs001.conf | 2 ++ .../lazy-load-jobs001.xml | 0 .../lazy-load-jobs001.yaml | 0 .../lazy-load-jobs002.xml | 0 .../lazy-load-jobs002.yaml | 0 .../lazy-load-scripts/echo_vars_1.1.sh | 0 .../lazy-load-scripts/echo_vars_1.2.sh | 0 .../lazy-load-wrappers-1.1.yaml.inc | 0 .../lazy-load-wrappers-1.2.yaml.inc | 0 .../mask_internal_component.xml | 0 .../mask_internal_component.yaml | 0 .../other_include_path/test.inc | 0 ...roject-in-folder-with-auth-properties.yaml | 0 ...oject-in-folder-with-auth-properties2.yaml | 0 .../project-matrix001.xml | 0 .../project-matrix001.yaml | 0 .../project-matrix002.xml | 0 .../project-matrix002.yaml | 0 .../project-with-auth-j2-yaml.xml | 0 .../project-with-auth-j2-yaml.yaml | 0 .../project-with-auth-properties.xml | 0 .../project-with-auth-properties.yaml | 0 .../project_flow_template001.xml | 0 .../project_flow_template001.yaml | 0 .../project_flow_template002.xml | 0 .../project_flow_template002.yaml | 0 .../project_flow_template003.xml | 0 .../project_flow_template003.yaml | 0 .../project_folder_template001.xml | 0 .../project_folder_template001.yaml | 0 .../project_folder_template002.xml | 0 .../project_folder_template002.yaml | 0 .../project_folder_template003.xml | 0 .../project_folder_template003.yaml | 0 .../project_pipeline_concurrent.xml | 0 .../project_pipeline_concurrent.yaml | 0 .../project_pipeline_template001.xml | 0 .../project_pipeline_template001.yaml | 0 .../project_pipeline_template002.xml | 0 .../project_pipeline_template002.yaml | 0 .../project_pipeline_template003.xml | 0 .../project_pipeline_template003.yaml | 0 .../project_pipeline_template004.xml | 0 .../project_pipeline_template004.yaml | 0 .../project_pipeline_template005.xml | 0 .../project_pipeline_template005.yaml | 0 .../project_pipeline_template006.xml | 0 .../project_pipeline_template006.yaml | 0 .../project_pipeline_triggers.xml | 0 .../project_pipeline_triggers.yaml | 0 .../project_workflow_template001.xml | 0 .../project_workflow_template001.yaml | 0 .../project_workflow_template002.xml | 0 .../project_workflow_template002.yaml | 0 .../project_workflow_template003.xml | 0 .../project_workflow_template003.yaml | 0 .../python-jobs/folders-job-name.xml | 0 .../scm_remote_deep_bug.xml | 0 .../scm_remote_deep_bug.yaml | 0 ...econd_order_parameter_interpolation001.xml | 0 ...cond_order_parameter_interpolation001.yaml | 0 ...econd_order_parameter_interpolation002.xml | 0 ...cond_order_parameter_interpolation002.yaml | 0 .../string_join.xml | 0 .../string_join.yaml | 0 .../ruby-jobs/folders-attribute.xml | 0 .../template_default_variables.xml | 0 .../template_default_variables.yaml | 0 .../template_exclude.xml | 0 .../template_exclude.yaml | 0 .../template_honor_defaults.xml | 0 .../template_honor_defaults.yaml | 0 .../template_ids.xml | 0 .../template_ids.yaml | 0 ...e_project_level_defaults.plugins_info.yaml | 0 ...mplate_override_project_level_defaults.xml | 0 ...plate_override_project_level_defaults.yaml | 0 .../template_without_exclude.xml | 0 .../template_without_exclude.yaml | 0 .../templates001.xml | 0 .../templates001.yaml | 0 .../templates002.xml | 0 .../templates002.yaml | 0 .../{fixtures => job_fixtures}/test.inc | 0 ...er-override-ordering-001.plugins_info.yaml | 0 .../parameter-override-ordering-001.xml | 0 .../parameter-override-ordering-001.yaml | 0 ...er-override-ordering-002.plugins_info.yaml | 0 .../parameter-override-ordering-002.xml | 0 .../parameter-override-ordering-002.yaml | 0 ...er-override-ordering-003.plugins_info.yaml | 0 .../parameter-override-ordering-003.xml | 0 .../parameter-override-ordering-003.yaml | 0 .../{fixtures => job_fixtures}/unicode001.xml | 0 .../unicode001.yaml | 0 .../unochoice/active-choices-param003.xml | 0 .../unochoice/dynamic-reference-param002.xml | 0 .../var_applied_in_defaults.xml | 0 .../var_applied_in_defaults.yaml | 0 .../variable_default_values.xml | 0 .../variable_default_values.yaml | 0 .../variable_defaults.xml | 0 .../variable_defaults.yaml | 0 .../variable_escaping.xml | 0 .../variable_escaping.yaml | 0 .../yaml_anchor.xml | 0 .../yaml_anchor.yaml | 0 ...st_parser_exceptions.py => test_errors.py} | 6 ++-- tests/yamlparser/test_jobs.py | 2 +- 248 files changed, 60 insertions(+), 60 deletions(-) rename tests/yamlparser/{exceptions => error_fixtures}/failure_formatting_params.yaml (100%) rename tests/yamlparser/{exceptions => error_fixtures}/failure_formatting_template.yaml (100%) rename tests/yamlparser/{exceptions => error_fixtures}/incorrect_template_dimensions.yaml (100%) delete mode 100644 tests/yamlparser/fixtures/include-raw-escape001.conf delete mode 100644 tests/yamlparser/fixtures/include_path001.conf delete mode 100644 tests/yamlparser/fixtures/include_path002.conf delete mode 100644 tests/yamlparser/fixtures/lazy-load-jobs001.conf rename tests/yamlparser/{fixtures => job_fixtures}/active-choices-param001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/active-choices-param001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/active-choices-param002.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/active-choices-param002.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/active-choices-param003.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/active-choices-reactive-param001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/active-choices-reactive-param001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/active-choices-reactive-param002.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/active-choices-reactive-param002.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/add_managed_to_desc.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/add_managed_to_desc.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/allow_empty_variables.conf (100%) rename tests/yamlparser/{fixtures => job_fixtures}/allow_empty_variables.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/allow_empty_variables.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/allow_empty_variables_include.conf (100%) rename tests/yamlparser/{fixtures => job_fixtures}/allow_empty_variables_include.sh (100%) rename tests/yamlparser/{fixtures => job_fixtures}/allow_empty_variables_include.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/allow_empty_variables_include.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/auth-jobs/project-in-folder-with-auth-properties.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/auth-jobs/project-in-folder-with-auth-properties2.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/complete-raw001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/complete-raw001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/complete001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/complete001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/concat_defaults001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/concat_defaults001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/concat_defaults002.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/concat_defaults002.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/critical_block_complete001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/critical_block_complete001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/custom_distri.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/custom_distri.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/default_template_variables_id_multi.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/default_template_variables_id_multi.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/deprecated-include001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/dont_overwrite_desc.conf (100%) rename tests/yamlparser/{fixtures => job_fixtures}/dont_overwrite_desc.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/dont_overwrite_desc.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/dynamic-reference-param001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/dynamic-reference-param001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/dynamic-reference-param002.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/expand-yaml-for-template-job/dimensionality-test001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/expand-yaml-for-template-job/dimensionality-test001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/folders-attribute.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/folders-job-name.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/folders/folders001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/folders001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/folders001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/general-example-001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/general-example-001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/github_cancel_builds_on_update_variable001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/github_cancel_builds_on_update_variable001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/github_cancel_builds_on_update_variable002.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/github_cancel_builds_on_update_variable002.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/hipchat1.plugins_info.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/hipchat1.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/hipchat1.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/include-raw-escape001-echo-vars.sh (100%) create mode 100644 tests/yamlparser/job_fixtures/include-raw-escape001.conf rename tests/yamlparser/{fixtures => job_fixtures}/include-raw-escape001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/include-raw-escape001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/include-raw001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/include-raw001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/include-raw002-cool.sh (100%) rename tests/yamlparser/{fixtures => job_fixtures}/include-raw002-cool.zsh (100%) rename tests/yamlparser/{fixtures => job_fixtures}/include-rawunicode001-cool.sh (100%) rename tests/yamlparser/{fixtures => job_fixtures}/include-rawunicode001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/include-rawunicode001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/include001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/include001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/include001.yaml.inc (100%) create mode 100644 tests/yamlparser/job_fixtures/include_path001.conf rename tests/yamlparser/{fixtures => job_fixtures}/include_path001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/include_path001.yaml (100%) create mode 100644 tests/yamlparser/job_fixtures/include_path002.conf rename tests/yamlparser/{fixtures => job_fixtures}/include_path002.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/include_path002.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-include01.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-include01.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-include01.yaml.inc (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-include02.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-include02.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-string01.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-string01.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-string02.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-string02.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-string03.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-string03.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-string04.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-string04.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-yaml01.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-yaml01.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-yaml02.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-yaml02.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-yaml03.groovy (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-yaml03.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-yaml03.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-yaml04-deepcopy.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja-yaml04-deepcopy.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja01.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja01.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja01.yaml.inc (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja02.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja02.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja02.yaml.inc (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja03.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja03.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jinja03.yaml.inc (100%) rename tests/yamlparser/{fixtures => job_fixtures}/job-parameter-precedence.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/job-parameter-precedence.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jobgroups_multi_use.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/jobgroups_multi_use.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/lazy-load-jinja001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/lazy-load-jinja001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/lazy-load-jobs-copy-files.yaml.inc (100%) rename tests/yamlparser/{fixtures => job_fixtures}/lazy-load-jobs-multi001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/lazy-load-jobs-multi001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/lazy-load-jobs-multi002.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/lazy-load-jobs-multi002.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/lazy-load-jobs-pre-scm-shell-ant.yaml.inc (100%) rename tests/yamlparser/{fixtures => job_fixtures}/lazy-load-jobs-timeout.yaml.inc (100%) create mode 100644 tests/yamlparser/job_fixtures/lazy-load-jobs001.conf rename tests/yamlparser/{fixtures => job_fixtures}/lazy-load-jobs001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/lazy-load-jobs001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/lazy-load-jobs002.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/lazy-load-jobs002.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/lazy-load-scripts/echo_vars_1.1.sh (100%) rename tests/yamlparser/{fixtures => job_fixtures}/lazy-load-scripts/echo_vars_1.2.sh (100%) rename tests/yamlparser/{fixtures => job_fixtures}/lazy-load-wrappers-1.1.yaml.inc (100%) rename tests/yamlparser/{fixtures => job_fixtures}/lazy-load-wrappers-1.2.yaml.inc (100%) rename tests/yamlparser/{fixtures => job_fixtures}/mask_internal_component.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/mask_internal_component.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/other_include_path/test.inc (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project-in-folder-with-auth-properties.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project-in-folder-with-auth-properties2.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project-matrix001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project-matrix001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project-matrix002.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project-matrix002.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project-with-auth-j2-yaml.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project-with-auth-j2-yaml.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project-with-auth-properties.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project-with-auth-properties.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_flow_template001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_flow_template001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_flow_template002.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_flow_template002.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_flow_template003.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_flow_template003.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_folder_template001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_folder_template001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_folder_template002.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_folder_template002.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_folder_template003.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_folder_template003.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_pipeline_concurrent.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_pipeline_concurrent.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_pipeline_template001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_pipeline_template001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_pipeline_template002.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_pipeline_template002.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_pipeline_template003.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_pipeline_template003.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_pipeline_template004.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_pipeline_template004.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_pipeline_template005.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_pipeline_template005.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_pipeline_template006.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_pipeline_template006.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_pipeline_triggers.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_pipeline_triggers.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_workflow_template001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_workflow_template001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_workflow_template002.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_workflow_template002.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_workflow_template003.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/project_workflow_template003.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/python-jobs/folders-job-name.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/scm_remote_deep_bug.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/scm_remote_deep_bug.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/second_order_parameter_interpolation001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/second_order_parameter_interpolation001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/second_order_parameter_interpolation002.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/second_order_parameter_interpolation002.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/string_join.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/string_join.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/team1-jobs/ruby-jobs/folders-attribute.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/template_default_variables.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/template_default_variables.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/template_exclude.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/template_exclude.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/template_honor_defaults.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/template_honor_defaults.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/template_ids.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/template_ids.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/template_override_project_level_defaults.plugins_info.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/template_override_project_level_defaults.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/template_override_project_level_defaults.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/template_without_exclude.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/template_without_exclude.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/templates001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/templates001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/templates002.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/templates002.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/test.inc (100%) rename tests/yamlparser/{fixtures => job_fixtures}/trigger_parameterized_builds/parameter-override-ordering-001.plugins_info.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/trigger_parameterized_builds/parameter-override-ordering-001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/trigger_parameterized_builds/parameter-override-ordering-001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/trigger_parameterized_builds/parameter-override-ordering-002.plugins_info.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/trigger_parameterized_builds/parameter-override-ordering-002.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/trigger_parameterized_builds/parameter-override-ordering-002.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/trigger_parameterized_builds/parameter-override-ordering-003.plugins_info.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/trigger_parameterized_builds/parameter-override-ordering-003.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/trigger_parameterized_builds/parameter-override-ordering-003.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/unicode001.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/unicode001.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/unochoice/active-choices-param003.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/unochoice/dynamic-reference-param002.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/var_applied_in_defaults.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/var_applied_in_defaults.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/variable_default_values.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/variable_default_values.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/variable_defaults.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/variable_defaults.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/variable_escaping.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/variable_escaping.yaml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/yaml_anchor.xml (100%) rename tests/yamlparser/{fixtures => job_fixtures}/yaml_anchor.yaml (100%) rename tests/yamlparser/{test_parser_exceptions.py => test_errors.py} (88%) diff --git a/doc/source/definition.rst b/doc/source/definition.rst index df2f9e85d..1718a2baf 100644 --- a/doc/source/definition.rst +++ b/doc/source/definition.rst @@ -168,7 +168,7 @@ job-template. More complex example: .. literalinclude:: - /../../tests/yamlparser/fixtures/template_default_variables.yaml + /../../tests/yamlparser/job_fixtures/template_default_variables.yaml :language: yaml To use a default value for a variable used in the name would be @@ -224,14 +224,14 @@ If there are templates being realized that differ only in the variable used for its name (thus not a use case for job-specific substitutions), additional variables can be specified for project variables. Example: -.. literalinclude:: /../../tests/yamlparser/fixtures/templates002.yaml +.. literalinclude:: /../../tests/yamlparser/job_fixtures/templates002.yaml You can also specify some variable combinations to exclude from the matrix with the ``exclude`` keyword, to avoid generating jobs for those combinations. You can specify all the variables of the combination or only a subset, if you specify a subset, any value of the omited variable will match: -.. literalinclude:: /../../tests/yamlparser/fixtures/template_exclude.yaml +.. literalinclude:: /../../tests/yamlparser/job_fixtures/template_exclude.yaml The above example will omit the jobs: @@ -244,7 +244,7 @@ a bit more complicated, that gets more complicated for each dimension in the combination, for the previous example, the counterpart would be: .. literalinclude:: - /../../tests/yamlparser/fixtures/template_without_exclude.yaml + /../../tests/yamlparser/job_fixtures/template_without_exclude.yaml Job Group ^^^^^^^^^ @@ -254,7 +254,7 @@ together, you can define a Job Group to collect them. Simply use the Job Group where you would normally use a `Job Template`_ and all of the Job Templates in the Job Group will be realized. For example: -.. literalinclude:: /../../tests/yamlparser/fixtures/templates001.yaml +.. literalinclude:: /../../tests/yamlparser/job_fixtures/templates001.yaml Would cause the jobs `project-name-unit-tests` and `project-name-perf-tests` to be created in Jenkins. @@ -450,11 +450,11 @@ own preferences. Job Name Example: -.. literalinclude:: /../../tests/yamlparser/fixtures/folders-job-name.yaml +.. literalinclude:: /../../tests/yamlparser/job_fixtures/folders-job-name.yaml Folder Attribute Example: -.. literalinclude:: /../../tests/yamlparser/fixtures/folders-attribute.yaml +.. literalinclude:: /../../tests/yamlparser/job_fixtures/folders-attribute.yaml .. _ids: @@ -476,7 +476,7 @@ to reference it instead of the name. This has two primary functions: Example: -.. literalinclude:: /../../tests/yamlparser/fixtures/template_ids.yaml +.. literalinclude:: /../../tests/yamlparser/job_fixtures/template_ids.yaml .. _raw: @@ -506,7 +506,7 @@ You can use `raw` in most locations, the following example show them with arbitrary xml-data: .. literalinclude:: - /../../tests/yamlparser/fixtures/complete-raw001.yaml + /../../tests/yamlparser/job_fixtures/complete-raw001.yaml Note: If you have a need to use `raw` please consider submitting a patch to add or fix the module that will remove your need to use `raw`. @@ -532,7 +532,7 @@ Will set the job description for every job created. You can define variables that will be realized in a `Job Template`. -.. literalinclude:: /../../tests/yamlparser/fixtures/template_honor_defaults.yaml +.. literalinclude:: /../../tests/yamlparser/job_fixtures/template_honor_defaults.yaml Would create jobs ``build-i386`` and ``build-amd64``. @@ -550,7 +550,7 @@ of code that retains the original object type. For example: -.. literalinclude:: /../../tests/yamlparser/fixtures/custom_distri.yaml +.. literalinclude:: /../../tests/yamlparser/job_fixtures/custom_distri.yaml JJB also supports interpolation of parameters within parameters. This allows a @@ -559,7 +559,7 @@ projects and job groups. For example: -.. literalinclude:: /../../tests/yamlparser/fixtures/second_order_parameter_interpolation002.yaml +.. literalinclude:: /../../tests/yamlparser/job_fixtures/second_order_parameter_interpolation002.yaml By default JJB will fail if it tries to interpolate a variable that was not @@ -568,7 +568,7 @@ allow_empty_variables configuration option. For example, having a configuration file with that option enabled: -.. literalinclude:: /../../tests/yamlparser/fixtures/allow_empty_variables.conf +.. literalinclude:: /../../tests/yamlparser/job_fixtures/allow_empty_variables.conf Will prevent JJb from failing if there are any non-initialized variables used and replace them with the empty string instead. @@ -649,7 +649,7 @@ that JJB definitions allow references to variables in templates. For example: -.. literalinclude:: /../../tests/yamlparser/fixtures/yaml_anchor.yaml +.. literalinclude:: /../../tests/yamlparser/job_fixtures/yaml_anchor.yaml The `anchors and aliases`_ are expanded internally within JJB's yaml loading diff --git a/doc/source/quick-start.rst b/doc/source/quick-start.rst index 1ee921531..8e07791a7 100644 --- a/doc/source/quick-start.rst +++ b/doc/source/quick-start.rst @@ -28,13 +28,13 @@ you to validate the XML before you attempt to upload it to Jenkins. Test a YAML job definition:: - jenkins-jobs test tests/yamlparser/fixtures/templates002.yaml + jenkins-jobs test tests/yamlparser/job_fixtures/templates002.yaml The above command prints the generated Jenkins XML to the console. If you prefer to send it to a directory:: - jenkins-jobs test -o output tests/yamlparser/fixtures/templates002.yaml + jenkins-jobs test -o output tests/yamlparser/job_fixtures/templates002.yaml The `output` directory will contain files with the XML configurations. @@ -49,7 +49,7 @@ Once you've tested your job definition and are happy with it then you can use th configuration file. An example file is supplied in the etc folder, you should update it to match your Jenkins master:: - jenkins-jobs --conf etc/jenkins_jobs.ini-sample update tests/yamlparser/fixtures/templates002.yaml + jenkins-jobs --conf etc/jenkins_jobs.ini-sample update tests/yamlparser/job_fixtures/templates002.yaml The above command will update your Jenkins master with the generated jobs. diff --git a/jenkins_jobs/local_yaml.py b/jenkins_jobs/local_yaml.py index 5ac2af325..7b49bf7c8 100644 --- a/jenkins_jobs/local_yaml.py +++ b/jenkins_jobs/local_yaml.py @@ -45,7 +45,7 @@ Generic Example: Environment Inject: - .. literalinclude:: /../../tests/yamlparser/fixtures/string_join.yaml + .. literalinclude:: /../../tests/yamlparser/job_fixtures/string_join.yaml While this mechanism can also be used items where delimiters are supported by @@ -78,7 +78,7 @@ Example: contents of include001.yaml.inc: - .. literalinclude:: /../../tests/yamlparser/fixtures/include001.yaml.inc + .. literalinclude:: /../../tests/yamlparser/job_fixtures/include001.yaml.inc The tag ``!include-raw:`` will treat the given string or list of strings as @@ -153,12 +153,12 @@ parsing, it is delayed until the variable substitution is performed. Example: - .. literalinclude:: /../../tests/yamlparser/fixtures/lazy-load-jobs001.yaml + .. literalinclude:: /../../tests/yamlparser/job_fixtures/lazy-load-jobs001.yaml using a list of files: .. literalinclude:: - /../../tests/yamlparser/fixtures/lazy-load-jobs-multi001.yaml + /../../tests/yamlparser/job_fixtures/lazy-load-jobs-multi001.yaml .. note:: @@ -182,11 +182,11 @@ templating that will happen with ``!include-raw``.) Examples: - .. literalinclude:: /../../tests/yamlparser/fixtures/jinja01.yaml + .. literalinclude:: /../../tests/yamlparser/job_fixtures/jinja01.yaml contents of jinja01.yaml.inc: - .. literalinclude:: /../../tests/yamlparser/fixtures/jinja01.yaml.inc + .. literalinclude:: /../../tests/yamlparser/job_fixtures/jinja01.yaml.inc The tag ``!j2:`` takes a string and treats it as a Jinja2 template. It will be @@ -195,7 +195,7 @@ construct. Examples: - .. literalinclude:: /../../tests/yamlparser/fixtures/jinja-string01.yaml + .. literalinclude:: /../../tests/yamlparser/job_fixtures/jinja-string01.yaml The tag ``!j2-yaml:`` is similar to the ``!j2:`` tag, just that it loads the Jinja-rendered string as YAML and embeds it in the calling YAML construct. This @@ -205,14 +205,14 @@ simpler configuration, without any duplication. Examples: - .. literalinclude:: /../../tests/yamlparser/fixtures/jinja-yaml01.yaml + .. literalinclude:: /../../tests/yamlparser/job_fixtures/jinja-yaml01.yaml Another use case is controlling lists dynamically, like conditionally adding list elements based on project configuration. Examples: - .. literalinclude:: /../../tests/yamlparser/fixtures/jinja-yaml02.yaml + .. literalinclude:: /../../tests/yamlparser/job_fixtures/jinja-yaml02.yaml """ diff --git a/jenkins_jobs/modules/builders.py b/jenkins_jobs/modules/builders.py index 970b3aac8..a85bad776 100644 --- a/jenkins_jobs/modules/builders.py +++ b/jenkins_jobs/modules/builders.py @@ -2322,7 +2322,7 @@ def critical_block_start(registry, xml_parent, data): Example: .. literalinclude:: - ../../tests/yamlparser/fixtures/critical_block_complete001.yaml + ../../tests/yamlparser/job_fixtures/critical_block_complete001.yaml :language: yaml """ cbs = XML.SubElement( @@ -2344,7 +2344,7 @@ def critical_block_end(registry, xml_parent, data): Example: .. literalinclude:: - ../../tests/yamlparser/fixtures/critical_block_complete001.yaml + ../../tests/yamlparser/job_fixtures/critical_block_complete001.yaml :language: yaml """ cbs = XML.SubElement( diff --git a/jenkins_jobs/modules/general.py b/jenkins_jobs/modules/general.py index daa6d1d78..c67f16d98 100644 --- a/jenkins_jobs/modules/general.py +++ b/jenkins_jobs/modules/general.py @@ -17,7 +17,7 @@ Example: -.. literalinclude:: /../../tests/yamlparser/fixtures/general-example-001.yaml +.. literalinclude:: /../../tests/yamlparser/job_fixtures/general-example-001.yaml :Job Parameters: * **project-type**: diff --git a/jenkins_jobs/modules/parameters.py b/jenkins_jobs/modules/parameters.py index 60d6d95db..4c4af1852 100644 --- a/jenkins_jobs/modules/parameters.py +++ b/jenkins_jobs/modules/parameters.py @@ -1237,13 +1237,13 @@ def active_choices_param(registry, xml_parent, data): Minimal Example: .. literalinclude:: - /../../tests/yamlparser/fixtures/active-choices-param001.yaml + /../../tests/yamlparser/job_fixtures/active-choices-param001.yaml :language: yaml Full Example: .. literalinclude:: - /../../tests/yamlparser/fixtures/active-choices-param002.yaml + /../../tests/yamlparser/job_fixtures/active-choices-param002.yaml :language: yaml """ element_name = "org.biouno.unochoice.ChoiceParameter" @@ -1295,13 +1295,13 @@ def active_choices_reactive_param(registry, xml_parent, data): Minimal Example: .. literalinclude:: - /../../tests/yamlparser/fixtures/active-choices-reactive-param001.yaml + /../../tests/yamlparser/job_fixtures/active-choices-reactive-param001.yaml :language: yaml Full Example: .. literalinclude:: - /../../tests/yamlparser/fixtures/active-choices-reactive-param002.yaml + /../../tests/yamlparser/job_fixtures/active-choices-reactive-param002.yaml :language: yaml """ @@ -1391,13 +1391,13 @@ def dynamic_reference_param(registry, xml_parent, data): Minimal Example: .. literalinclude:: - /../../tests/yamlparser/fixtures/dynamic-reference-param001.yaml + /../../tests/yamlparser/job_fixtures/dynamic-reference-param001.yaml :language: yaml Full Example: .. literalinclude:: - /../../tests/yamlparser/fixtures/dynamic-reference-param002.yaml + /../../tests/yamlparser/job_fixtures/dynamic-reference-param002.yaml :language: yaml """ element_name = "org.biouno.unochoice.DynamicReferenceParameter" diff --git a/jenkins_jobs/modules/project_flow.py b/jenkins_jobs/modules/project_flow.py index a7a2d0533..df1b30e73 100644 --- a/jenkins_jobs/modules/project_flow.py +++ b/jenkins_jobs/modules/project_flow.py @@ -35,17 +35,17 @@ python str.format() command. Job example: .. literalinclude:: - /../../tests/yamlparser/fixtures/project_flow_template001.yaml + /../../tests/yamlparser/job_fixtures/project_flow_template001.yaml Job template example: .. literalinclude:: - /../../tests/yamlparser/fixtures/project_flow_template002.yaml + /../../tests/yamlparser/job_fixtures/project_flow_template002.yaml Job example runninng a DSL file from the workspace: .. literalinclude:: - /../../tests/yamlparser/fixtures/project_flow_template003.yaml + /../../tests/yamlparser/job_fixtures/project_flow_template003.yaml """ diff --git a/jenkins_jobs/modules/project_folder.py b/jenkins_jobs/modules/project_folder.py index 61885d979..801b84a02 100644 --- a/jenkins_jobs/modules/project_folder.py +++ b/jenkins_jobs/modules/project_folder.py @@ -25,12 +25,12 @@ Requires the Jenkins :jenkins-plugins:`CloudBees Folders Plugin Job example: .. literalinclude:: - /../../tests/yamlparser/fixtures/project_folder_template001.yaml + /../../tests/yamlparser/job_fixtures/project_folder_template001.yaml Job template example: .. literalinclude:: - /../../tests/yamlparser/fixtures/project_folder_template002.yaml + /../../tests/yamlparser/job_fixtures/project_folder_template002.yaml """ diff --git a/jenkins_jobs/modules/project_matrix.py b/jenkins_jobs/modules/project_matrix.py index f9fd4fc6e..bea45f59d 100644 --- a/jenkins_jobs/modules/project_matrix.py +++ b/jenkins_jobs/modules/project_matrix.py @@ -84,7 +84,7 @@ Requires the Jenkins :jenkins-plugins:`ShiningPanda Plugin `. Example: - .. literalinclude:: /../../tests/yamlparser/fixtures/project-matrix001.yaml + .. literalinclude:: /../../tests/yamlparser/job_fixtures/project-matrix001.yaml :language: yaml Examples for yaml axis: diff --git a/jenkins_jobs/modules/project_pipeline.py b/jenkins_jobs/modules/project_pipeline.py index 15c39cb4b..9a4004e1a 100644 --- a/jenkins_jobs/modules/project_pipeline.py +++ b/jenkins_jobs/modules/project_pipeline.py @@ -49,27 +49,27 @@ Note that ``dsl`` and ``pipeline-scm`` parameters are mutually exclusive. Inline DSL job example: .. literalinclude:: - /../../tests/yamlparser/fixtures/project_pipeline_template001.yaml + /../../tests/yamlparser/job_fixtures/project_pipeline_template001.yaml Inline DSL job template example: .. literalinclude:: - /../../tests/yamlparser/fixtures/project_pipeline_template002.yaml + /../../tests/yamlparser/job_fixtures/project_pipeline_template002.yaml "Pipeline as code" example: .. literalinclude:: - /../../tests/yamlparser/fixtures/project_pipeline_template004.yaml + /../../tests/yamlparser/job_fixtures/project_pipeline_template004.yaml "Pipeline as code" example using templates: .. literalinclude:: - /../../tests/yamlparser/fixtures/project_pipeline_template005.yaml + /../../tests/yamlparser/job_fixtures/project_pipeline_template005.yaml "Pipeline as nested stage" example : .. literalinclude:: - /../../tests/yamlparser/fixtures/project_pipeline_template006.yaml + /../../tests/yamlparser/job_fixtures/project_pipeline_template006.yaml .. _Pipeline as code: https://jenkins.io/solutions/pipeline/ diff --git a/jenkins_jobs/modules/project_workflow.py b/jenkins_jobs/modules/project_workflow.py index 994e89c81..e6499aab7 100644 --- a/jenkins_jobs/modules/project_workflow.py +++ b/jenkins_jobs/modules/project_workflow.py @@ -39,12 +39,12 @@ python str.format() command. Job example: .. literalinclude:: - /../../tests/yamlparser/fixtures/project_workflow_template001.yaml + /../../tests/yamlparser/job_fixtures/project_workflow_template001.yaml Job template example: .. literalinclude:: - /../../tests/yamlparser/fixtures/project_workflow_template002.yaml + /../../tests/yamlparser/job_fixtures/project_workflow_template002.yaml """ import logging diff --git a/tests/yamlparser/exceptions/failure_formatting_params.yaml b/tests/yamlparser/error_fixtures/failure_formatting_params.yaml similarity index 100% rename from tests/yamlparser/exceptions/failure_formatting_params.yaml rename to tests/yamlparser/error_fixtures/failure_formatting_params.yaml diff --git a/tests/yamlparser/exceptions/failure_formatting_template.yaml b/tests/yamlparser/error_fixtures/failure_formatting_template.yaml similarity index 100% rename from tests/yamlparser/exceptions/failure_formatting_template.yaml rename to tests/yamlparser/error_fixtures/failure_formatting_template.yaml diff --git a/tests/yamlparser/exceptions/incorrect_template_dimensions.yaml b/tests/yamlparser/error_fixtures/incorrect_template_dimensions.yaml similarity index 100% rename from tests/yamlparser/exceptions/incorrect_template_dimensions.yaml rename to tests/yamlparser/error_fixtures/incorrect_template_dimensions.yaml diff --git a/tests/yamlparser/fixtures/include-raw-escape001.conf b/tests/yamlparser/fixtures/include-raw-escape001.conf deleted file mode 100644 index 28027f4bb..000000000 --- a/tests/yamlparser/fixtures/include-raw-escape001.conf +++ /dev/null @@ -1,2 +0,0 @@ -[job_builder] -include_path=tests/localyaml/fixtures:. diff --git a/tests/yamlparser/fixtures/include_path001.conf b/tests/yamlparser/fixtures/include_path001.conf deleted file mode 100644 index 29503c31f..000000000 --- a/tests/yamlparser/fixtures/include_path001.conf +++ /dev/null @@ -1,2 +0,0 @@ -[job_builder] -include_path=tests/yamlparser/fixtures:tests/yamlparser/fixtures/other_include_path diff --git a/tests/yamlparser/fixtures/include_path002.conf b/tests/yamlparser/fixtures/include_path002.conf deleted file mode 100644 index 039e34b83..000000000 --- a/tests/yamlparser/fixtures/include_path002.conf +++ /dev/null @@ -1,2 +0,0 @@ -[job_builder] -include_path=tests/yamlparser/fixtures/other_include_path:tests/yamlparser/fixtures diff --git a/tests/yamlparser/fixtures/lazy-load-jobs001.conf b/tests/yamlparser/fixtures/lazy-load-jobs001.conf deleted file mode 100644 index e04ecff65..000000000 --- a/tests/yamlparser/fixtures/lazy-load-jobs001.conf +++ /dev/null @@ -1,2 +0,0 @@ -[job_builder] -include_path=tests/yamlparser/fixtures/lazy-load-scripts diff --git a/tests/yamlparser/fixtures/active-choices-param001.xml b/tests/yamlparser/job_fixtures/active-choices-param001.xml similarity index 100% rename from tests/yamlparser/fixtures/active-choices-param001.xml rename to tests/yamlparser/job_fixtures/active-choices-param001.xml diff --git a/tests/yamlparser/fixtures/active-choices-param001.yaml b/tests/yamlparser/job_fixtures/active-choices-param001.yaml similarity index 100% rename from tests/yamlparser/fixtures/active-choices-param001.yaml rename to tests/yamlparser/job_fixtures/active-choices-param001.yaml diff --git a/tests/yamlparser/fixtures/active-choices-param002.xml b/tests/yamlparser/job_fixtures/active-choices-param002.xml similarity index 100% rename from tests/yamlparser/fixtures/active-choices-param002.xml rename to tests/yamlparser/job_fixtures/active-choices-param002.xml diff --git a/tests/yamlparser/fixtures/active-choices-param002.yaml b/tests/yamlparser/job_fixtures/active-choices-param002.yaml similarity index 100% rename from tests/yamlparser/fixtures/active-choices-param002.yaml rename to tests/yamlparser/job_fixtures/active-choices-param002.yaml diff --git a/tests/yamlparser/fixtures/active-choices-param003.yaml b/tests/yamlparser/job_fixtures/active-choices-param003.yaml similarity index 100% rename from tests/yamlparser/fixtures/active-choices-param003.yaml rename to tests/yamlparser/job_fixtures/active-choices-param003.yaml diff --git a/tests/yamlparser/fixtures/active-choices-reactive-param001.xml b/tests/yamlparser/job_fixtures/active-choices-reactive-param001.xml similarity index 100% rename from tests/yamlparser/fixtures/active-choices-reactive-param001.xml rename to tests/yamlparser/job_fixtures/active-choices-reactive-param001.xml diff --git a/tests/yamlparser/fixtures/active-choices-reactive-param001.yaml b/tests/yamlparser/job_fixtures/active-choices-reactive-param001.yaml similarity index 100% rename from tests/yamlparser/fixtures/active-choices-reactive-param001.yaml rename to tests/yamlparser/job_fixtures/active-choices-reactive-param001.yaml diff --git a/tests/yamlparser/fixtures/active-choices-reactive-param002.xml b/tests/yamlparser/job_fixtures/active-choices-reactive-param002.xml similarity index 100% rename from tests/yamlparser/fixtures/active-choices-reactive-param002.xml rename to tests/yamlparser/job_fixtures/active-choices-reactive-param002.xml diff --git a/tests/yamlparser/fixtures/active-choices-reactive-param002.yaml b/tests/yamlparser/job_fixtures/active-choices-reactive-param002.yaml similarity index 100% rename from tests/yamlparser/fixtures/active-choices-reactive-param002.yaml rename to tests/yamlparser/job_fixtures/active-choices-reactive-param002.yaml diff --git a/tests/yamlparser/fixtures/add_managed_to_desc.xml b/tests/yamlparser/job_fixtures/add_managed_to_desc.xml similarity index 100% rename from tests/yamlparser/fixtures/add_managed_to_desc.xml rename to tests/yamlparser/job_fixtures/add_managed_to_desc.xml diff --git a/tests/yamlparser/fixtures/add_managed_to_desc.yaml b/tests/yamlparser/job_fixtures/add_managed_to_desc.yaml similarity index 100% rename from tests/yamlparser/fixtures/add_managed_to_desc.yaml rename to tests/yamlparser/job_fixtures/add_managed_to_desc.yaml diff --git a/tests/yamlparser/fixtures/allow_empty_variables.conf b/tests/yamlparser/job_fixtures/allow_empty_variables.conf similarity index 100% rename from tests/yamlparser/fixtures/allow_empty_variables.conf rename to tests/yamlparser/job_fixtures/allow_empty_variables.conf diff --git a/tests/yamlparser/fixtures/allow_empty_variables.xml b/tests/yamlparser/job_fixtures/allow_empty_variables.xml similarity index 100% rename from tests/yamlparser/fixtures/allow_empty_variables.xml rename to tests/yamlparser/job_fixtures/allow_empty_variables.xml diff --git a/tests/yamlparser/fixtures/allow_empty_variables.yaml b/tests/yamlparser/job_fixtures/allow_empty_variables.yaml similarity index 100% rename from tests/yamlparser/fixtures/allow_empty_variables.yaml rename to tests/yamlparser/job_fixtures/allow_empty_variables.yaml diff --git a/tests/yamlparser/fixtures/allow_empty_variables_include.conf b/tests/yamlparser/job_fixtures/allow_empty_variables_include.conf similarity index 100% rename from tests/yamlparser/fixtures/allow_empty_variables_include.conf rename to tests/yamlparser/job_fixtures/allow_empty_variables_include.conf diff --git a/tests/yamlparser/fixtures/allow_empty_variables_include.sh b/tests/yamlparser/job_fixtures/allow_empty_variables_include.sh similarity index 100% rename from tests/yamlparser/fixtures/allow_empty_variables_include.sh rename to tests/yamlparser/job_fixtures/allow_empty_variables_include.sh diff --git a/tests/yamlparser/fixtures/allow_empty_variables_include.xml b/tests/yamlparser/job_fixtures/allow_empty_variables_include.xml similarity index 100% rename from tests/yamlparser/fixtures/allow_empty_variables_include.xml rename to tests/yamlparser/job_fixtures/allow_empty_variables_include.xml diff --git a/tests/yamlparser/fixtures/allow_empty_variables_include.yaml b/tests/yamlparser/job_fixtures/allow_empty_variables_include.yaml similarity index 100% rename from tests/yamlparser/fixtures/allow_empty_variables_include.yaml rename to tests/yamlparser/job_fixtures/allow_empty_variables_include.yaml diff --git a/tests/yamlparser/fixtures/auth-jobs/project-in-folder-with-auth-properties.xml b/tests/yamlparser/job_fixtures/auth-jobs/project-in-folder-with-auth-properties.xml similarity index 100% rename from tests/yamlparser/fixtures/auth-jobs/project-in-folder-with-auth-properties.xml rename to tests/yamlparser/job_fixtures/auth-jobs/project-in-folder-with-auth-properties.xml diff --git a/tests/yamlparser/fixtures/auth-jobs/project-in-folder-with-auth-properties2.xml b/tests/yamlparser/job_fixtures/auth-jobs/project-in-folder-with-auth-properties2.xml similarity index 100% rename from tests/yamlparser/fixtures/auth-jobs/project-in-folder-with-auth-properties2.xml rename to tests/yamlparser/job_fixtures/auth-jobs/project-in-folder-with-auth-properties2.xml diff --git a/tests/yamlparser/fixtures/complete-raw001.xml b/tests/yamlparser/job_fixtures/complete-raw001.xml similarity index 100% rename from tests/yamlparser/fixtures/complete-raw001.xml rename to tests/yamlparser/job_fixtures/complete-raw001.xml diff --git a/tests/yamlparser/fixtures/complete-raw001.yaml b/tests/yamlparser/job_fixtures/complete-raw001.yaml similarity index 100% rename from tests/yamlparser/fixtures/complete-raw001.yaml rename to tests/yamlparser/job_fixtures/complete-raw001.yaml diff --git a/tests/yamlparser/fixtures/complete001.xml b/tests/yamlparser/job_fixtures/complete001.xml similarity index 100% rename from tests/yamlparser/fixtures/complete001.xml rename to tests/yamlparser/job_fixtures/complete001.xml diff --git a/tests/yamlparser/fixtures/complete001.yaml b/tests/yamlparser/job_fixtures/complete001.yaml similarity index 100% rename from tests/yamlparser/fixtures/complete001.yaml rename to tests/yamlparser/job_fixtures/complete001.yaml diff --git a/tests/yamlparser/fixtures/concat_defaults001.xml b/tests/yamlparser/job_fixtures/concat_defaults001.xml similarity index 100% rename from tests/yamlparser/fixtures/concat_defaults001.xml rename to tests/yamlparser/job_fixtures/concat_defaults001.xml diff --git a/tests/yamlparser/fixtures/concat_defaults001.yaml b/tests/yamlparser/job_fixtures/concat_defaults001.yaml similarity index 100% rename from tests/yamlparser/fixtures/concat_defaults001.yaml rename to tests/yamlparser/job_fixtures/concat_defaults001.yaml diff --git a/tests/yamlparser/fixtures/concat_defaults002.xml b/tests/yamlparser/job_fixtures/concat_defaults002.xml similarity index 100% rename from tests/yamlparser/fixtures/concat_defaults002.xml rename to tests/yamlparser/job_fixtures/concat_defaults002.xml diff --git a/tests/yamlparser/fixtures/concat_defaults002.yaml b/tests/yamlparser/job_fixtures/concat_defaults002.yaml similarity index 100% rename from tests/yamlparser/fixtures/concat_defaults002.yaml rename to tests/yamlparser/job_fixtures/concat_defaults002.yaml diff --git a/tests/yamlparser/fixtures/critical_block_complete001.xml b/tests/yamlparser/job_fixtures/critical_block_complete001.xml similarity index 100% rename from tests/yamlparser/fixtures/critical_block_complete001.xml rename to tests/yamlparser/job_fixtures/critical_block_complete001.xml diff --git a/tests/yamlparser/fixtures/critical_block_complete001.yaml b/tests/yamlparser/job_fixtures/critical_block_complete001.yaml similarity index 100% rename from tests/yamlparser/fixtures/critical_block_complete001.yaml rename to tests/yamlparser/job_fixtures/critical_block_complete001.yaml diff --git a/tests/yamlparser/fixtures/custom_distri.xml b/tests/yamlparser/job_fixtures/custom_distri.xml similarity index 100% rename from tests/yamlparser/fixtures/custom_distri.xml rename to tests/yamlparser/job_fixtures/custom_distri.xml diff --git a/tests/yamlparser/fixtures/custom_distri.yaml b/tests/yamlparser/job_fixtures/custom_distri.yaml similarity index 100% rename from tests/yamlparser/fixtures/custom_distri.yaml rename to tests/yamlparser/job_fixtures/custom_distri.yaml diff --git a/tests/yamlparser/fixtures/default_template_variables_id_multi.xml b/tests/yamlparser/job_fixtures/default_template_variables_id_multi.xml similarity index 100% rename from tests/yamlparser/fixtures/default_template_variables_id_multi.xml rename to tests/yamlparser/job_fixtures/default_template_variables_id_multi.xml diff --git a/tests/yamlparser/fixtures/default_template_variables_id_multi.yaml b/tests/yamlparser/job_fixtures/default_template_variables_id_multi.yaml similarity index 100% rename from tests/yamlparser/fixtures/default_template_variables_id_multi.yaml rename to tests/yamlparser/job_fixtures/default_template_variables_id_multi.yaml diff --git a/tests/yamlparser/fixtures/deprecated-include001.xml b/tests/yamlparser/job_fixtures/deprecated-include001.xml similarity index 100% rename from tests/yamlparser/fixtures/deprecated-include001.xml rename to tests/yamlparser/job_fixtures/deprecated-include001.xml diff --git a/tests/yamlparser/fixtures/dont_overwrite_desc.conf b/tests/yamlparser/job_fixtures/dont_overwrite_desc.conf similarity index 100% rename from tests/yamlparser/fixtures/dont_overwrite_desc.conf rename to tests/yamlparser/job_fixtures/dont_overwrite_desc.conf diff --git a/tests/yamlparser/fixtures/dont_overwrite_desc.xml b/tests/yamlparser/job_fixtures/dont_overwrite_desc.xml similarity index 100% rename from tests/yamlparser/fixtures/dont_overwrite_desc.xml rename to tests/yamlparser/job_fixtures/dont_overwrite_desc.xml diff --git a/tests/yamlparser/fixtures/dont_overwrite_desc.yaml b/tests/yamlparser/job_fixtures/dont_overwrite_desc.yaml similarity index 100% rename from tests/yamlparser/fixtures/dont_overwrite_desc.yaml rename to tests/yamlparser/job_fixtures/dont_overwrite_desc.yaml diff --git a/tests/yamlparser/fixtures/dynamic-reference-param001.xml b/tests/yamlparser/job_fixtures/dynamic-reference-param001.xml similarity index 100% rename from tests/yamlparser/fixtures/dynamic-reference-param001.xml rename to tests/yamlparser/job_fixtures/dynamic-reference-param001.xml diff --git a/tests/yamlparser/fixtures/dynamic-reference-param001.yaml b/tests/yamlparser/job_fixtures/dynamic-reference-param001.yaml similarity index 100% rename from tests/yamlparser/fixtures/dynamic-reference-param001.yaml rename to tests/yamlparser/job_fixtures/dynamic-reference-param001.yaml diff --git a/tests/yamlparser/fixtures/dynamic-reference-param002.yaml b/tests/yamlparser/job_fixtures/dynamic-reference-param002.yaml similarity index 100% rename from tests/yamlparser/fixtures/dynamic-reference-param002.yaml rename to tests/yamlparser/job_fixtures/dynamic-reference-param002.yaml diff --git a/tests/yamlparser/fixtures/expand-yaml-for-template-job/dimensionality-test001.xml b/tests/yamlparser/job_fixtures/expand-yaml-for-template-job/dimensionality-test001.xml similarity index 100% rename from tests/yamlparser/fixtures/expand-yaml-for-template-job/dimensionality-test001.xml rename to tests/yamlparser/job_fixtures/expand-yaml-for-template-job/dimensionality-test001.xml diff --git a/tests/yamlparser/fixtures/expand-yaml-for-template-job/dimensionality-test001.yaml b/tests/yamlparser/job_fixtures/expand-yaml-for-template-job/dimensionality-test001.yaml similarity index 100% rename from tests/yamlparser/fixtures/expand-yaml-for-template-job/dimensionality-test001.yaml rename to tests/yamlparser/job_fixtures/expand-yaml-for-template-job/dimensionality-test001.yaml diff --git a/tests/yamlparser/fixtures/folders-attribute.yaml b/tests/yamlparser/job_fixtures/folders-attribute.yaml similarity index 100% rename from tests/yamlparser/fixtures/folders-attribute.yaml rename to tests/yamlparser/job_fixtures/folders-attribute.yaml diff --git a/tests/yamlparser/fixtures/folders-job-name.yaml b/tests/yamlparser/job_fixtures/folders-job-name.yaml similarity index 100% rename from tests/yamlparser/fixtures/folders-job-name.yaml rename to tests/yamlparser/job_fixtures/folders-job-name.yaml diff --git a/tests/yamlparser/fixtures/folders/folders001.xml b/tests/yamlparser/job_fixtures/folders/folders001.xml similarity index 100% rename from tests/yamlparser/fixtures/folders/folders001.xml rename to tests/yamlparser/job_fixtures/folders/folders001.xml diff --git a/tests/yamlparser/fixtures/folders001.xml b/tests/yamlparser/job_fixtures/folders001.xml similarity index 100% rename from tests/yamlparser/fixtures/folders001.xml rename to tests/yamlparser/job_fixtures/folders001.xml diff --git a/tests/yamlparser/fixtures/folders001.yaml b/tests/yamlparser/job_fixtures/folders001.yaml similarity index 100% rename from tests/yamlparser/fixtures/folders001.yaml rename to tests/yamlparser/job_fixtures/folders001.yaml diff --git a/tests/yamlparser/fixtures/general-example-001.xml b/tests/yamlparser/job_fixtures/general-example-001.xml similarity index 100% rename from tests/yamlparser/fixtures/general-example-001.xml rename to tests/yamlparser/job_fixtures/general-example-001.xml diff --git a/tests/yamlparser/fixtures/general-example-001.yaml b/tests/yamlparser/job_fixtures/general-example-001.yaml similarity index 100% rename from tests/yamlparser/fixtures/general-example-001.yaml rename to tests/yamlparser/job_fixtures/general-example-001.yaml diff --git a/tests/yamlparser/fixtures/github_cancel_builds_on_update_variable001.xml b/tests/yamlparser/job_fixtures/github_cancel_builds_on_update_variable001.xml similarity index 100% rename from tests/yamlparser/fixtures/github_cancel_builds_on_update_variable001.xml rename to tests/yamlparser/job_fixtures/github_cancel_builds_on_update_variable001.xml diff --git a/tests/yamlparser/fixtures/github_cancel_builds_on_update_variable001.yaml b/tests/yamlparser/job_fixtures/github_cancel_builds_on_update_variable001.yaml similarity index 100% rename from tests/yamlparser/fixtures/github_cancel_builds_on_update_variable001.yaml rename to tests/yamlparser/job_fixtures/github_cancel_builds_on_update_variable001.yaml diff --git a/tests/yamlparser/fixtures/github_cancel_builds_on_update_variable002.xml b/tests/yamlparser/job_fixtures/github_cancel_builds_on_update_variable002.xml similarity index 100% rename from tests/yamlparser/fixtures/github_cancel_builds_on_update_variable002.xml rename to tests/yamlparser/job_fixtures/github_cancel_builds_on_update_variable002.xml diff --git a/tests/yamlparser/fixtures/github_cancel_builds_on_update_variable002.yaml b/tests/yamlparser/job_fixtures/github_cancel_builds_on_update_variable002.yaml similarity index 100% rename from tests/yamlparser/fixtures/github_cancel_builds_on_update_variable002.yaml rename to tests/yamlparser/job_fixtures/github_cancel_builds_on_update_variable002.yaml diff --git a/tests/yamlparser/fixtures/hipchat1.plugins_info.yaml b/tests/yamlparser/job_fixtures/hipchat1.plugins_info.yaml similarity index 100% rename from tests/yamlparser/fixtures/hipchat1.plugins_info.yaml rename to tests/yamlparser/job_fixtures/hipchat1.plugins_info.yaml diff --git a/tests/yamlparser/fixtures/hipchat1.xml b/tests/yamlparser/job_fixtures/hipchat1.xml similarity index 100% rename from tests/yamlparser/fixtures/hipchat1.xml rename to tests/yamlparser/job_fixtures/hipchat1.xml diff --git a/tests/yamlparser/fixtures/hipchat1.yaml b/tests/yamlparser/job_fixtures/hipchat1.yaml similarity index 100% rename from tests/yamlparser/fixtures/hipchat1.yaml rename to tests/yamlparser/job_fixtures/hipchat1.yaml diff --git a/tests/yamlparser/fixtures/include-raw-escape001-echo-vars.sh b/tests/yamlparser/job_fixtures/include-raw-escape001-echo-vars.sh similarity index 100% rename from tests/yamlparser/fixtures/include-raw-escape001-echo-vars.sh rename to tests/yamlparser/job_fixtures/include-raw-escape001-echo-vars.sh diff --git a/tests/yamlparser/job_fixtures/include-raw-escape001.conf b/tests/yamlparser/job_fixtures/include-raw-escape001.conf new file mode 100644 index 000000000..f22c9feb2 --- /dev/null +++ b/tests/yamlparser/job_fixtures/include-raw-escape001.conf @@ -0,0 +1,2 @@ +[job_builder] +include_path=tests/yamlparser/job_fixtures:. diff --git a/tests/yamlparser/fixtures/include-raw-escape001.xml b/tests/yamlparser/job_fixtures/include-raw-escape001.xml similarity index 100% rename from tests/yamlparser/fixtures/include-raw-escape001.xml rename to tests/yamlparser/job_fixtures/include-raw-escape001.xml diff --git a/tests/yamlparser/fixtures/include-raw-escape001.yaml b/tests/yamlparser/job_fixtures/include-raw-escape001.yaml similarity index 100% rename from tests/yamlparser/fixtures/include-raw-escape001.yaml rename to tests/yamlparser/job_fixtures/include-raw-escape001.yaml diff --git a/tests/yamlparser/fixtures/include-raw001.xml b/tests/yamlparser/job_fixtures/include-raw001.xml similarity index 100% rename from tests/yamlparser/fixtures/include-raw001.xml rename to tests/yamlparser/job_fixtures/include-raw001.xml diff --git a/tests/yamlparser/fixtures/include-raw001.yaml b/tests/yamlparser/job_fixtures/include-raw001.yaml similarity index 100% rename from tests/yamlparser/fixtures/include-raw001.yaml rename to tests/yamlparser/job_fixtures/include-raw001.yaml diff --git a/tests/yamlparser/fixtures/include-raw002-cool.sh b/tests/yamlparser/job_fixtures/include-raw002-cool.sh similarity index 100% rename from tests/yamlparser/fixtures/include-raw002-cool.sh rename to tests/yamlparser/job_fixtures/include-raw002-cool.sh diff --git a/tests/yamlparser/fixtures/include-raw002-cool.zsh b/tests/yamlparser/job_fixtures/include-raw002-cool.zsh similarity index 100% rename from tests/yamlparser/fixtures/include-raw002-cool.zsh rename to tests/yamlparser/job_fixtures/include-raw002-cool.zsh diff --git a/tests/yamlparser/fixtures/include-rawunicode001-cool.sh b/tests/yamlparser/job_fixtures/include-rawunicode001-cool.sh similarity index 100% rename from tests/yamlparser/fixtures/include-rawunicode001-cool.sh rename to tests/yamlparser/job_fixtures/include-rawunicode001-cool.sh diff --git a/tests/yamlparser/fixtures/include-rawunicode001.xml b/tests/yamlparser/job_fixtures/include-rawunicode001.xml similarity index 100% rename from tests/yamlparser/fixtures/include-rawunicode001.xml rename to tests/yamlparser/job_fixtures/include-rawunicode001.xml diff --git a/tests/yamlparser/fixtures/include-rawunicode001.yaml b/tests/yamlparser/job_fixtures/include-rawunicode001.yaml similarity index 100% rename from tests/yamlparser/fixtures/include-rawunicode001.yaml rename to tests/yamlparser/job_fixtures/include-rawunicode001.yaml diff --git a/tests/yamlparser/fixtures/include001.xml b/tests/yamlparser/job_fixtures/include001.xml similarity index 100% rename from tests/yamlparser/fixtures/include001.xml rename to tests/yamlparser/job_fixtures/include001.xml diff --git a/tests/yamlparser/fixtures/include001.yaml b/tests/yamlparser/job_fixtures/include001.yaml similarity index 100% rename from tests/yamlparser/fixtures/include001.yaml rename to tests/yamlparser/job_fixtures/include001.yaml diff --git a/tests/yamlparser/fixtures/include001.yaml.inc b/tests/yamlparser/job_fixtures/include001.yaml.inc similarity index 100% rename from tests/yamlparser/fixtures/include001.yaml.inc rename to tests/yamlparser/job_fixtures/include001.yaml.inc diff --git a/tests/yamlparser/job_fixtures/include_path001.conf b/tests/yamlparser/job_fixtures/include_path001.conf new file mode 100644 index 000000000..d57f3880f --- /dev/null +++ b/tests/yamlparser/job_fixtures/include_path001.conf @@ -0,0 +1,2 @@ +[job_builder] +include_path=tests/yamlparser/job_fixtures:tests/yamlparser/job_fixtures/other_include_path diff --git a/tests/yamlparser/fixtures/include_path001.xml b/tests/yamlparser/job_fixtures/include_path001.xml similarity index 100% rename from tests/yamlparser/fixtures/include_path001.xml rename to tests/yamlparser/job_fixtures/include_path001.xml diff --git a/tests/yamlparser/fixtures/include_path001.yaml b/tests/yamlparser/job_fixtures/include_path001.yaml similarity index 100% rename from tests/yamlparser/fixtures/include_path001.yaml rename to tests/yamlparser/job_fixtures/include_path001.yaml diff --git a/tests/yamlparser/job_fixtures/include_path002.conf b/tests/yamlparser/job_fixtures/include_path002.conf new file mode 100644 index 000000000..5fed2d9eb --- /dev/null +++ b/tests/yamlparser/job_fixtures/include_path002.conf @@ -0,0 +1,2 @@ +[job_builder] +include_path=tests/yamlparser/job_fixtures/other_include_path:tests/yamlparser/job_fixtures diff --git a/tests/yamlparser/fixtures/include_path002.xml b/tests/yamlparser/job_fixtures/include_path002.xml similarity index 100% rename from tests/yamlparser/fixtures/include_path002.xml rename to tests/yamlparser/job_fixtures/include_path002.xml diff --git a/tests/yamlparser/fixtures/include_path002.yaml b/tests/yamlparser/job_fixtures/include_path002.yaml similarity index 100% rename from tests/yamlparser/fixtures/include_path002.yaml rename to tests/yamlparser/job_fixtures/include_path002.yaml diff --git a/tests/yamlparser/fixtures/jinja-include01.xml b/tests/yamlparser/job_fixtures/jinja-include01.xml similarity index 100% rename from tests/yamlparser/fixtures/jinja-include01.xml rename to tests/yamlparser/job_fixtures/jinja-include01.xml diff --git a/tests/yamlparser/fixtures/jinja-include01.yaml b/tests/yamlparser/job_fixtures/jinja-include01.yaml similarity index 100% rename from tests/yamlparser/fixtures/jinja-include01.yaml rename to tests/yamlparser/job_fixtures/jinja-include01.yaml diff --git a/tests/yamlparser/fixtures/jinja-include01.yaml.inc b/tests/yamlparser/job_fixtures/jinja-include01.yaml.inc similarity index 100% rename from tests/yamlparser/fixtures/jinja-include01.yaml.inc rename to tests/yamlparser/job_fixtures/jinja-include01.yaml.inc diff --git a/tests/yamlparser/fixtures/jinja-include02.xml b/tests/yamlparser/job_fixtures/jinja-include02.xml similarity index 100% rename from tests/yamlparser/fixtures/jinja-include02.xml rename to tests/yamlparser/job_fixtures/jinja-include02.xml diff --git a/tests/yamlparser/fixtures/jinja-include02.yaml b/tests/yamlparser/job_fixtures/jinja-include02.yaml similarity index 100% rename from tests/yamlparser/fixtures/jinja-include02.yaml rename to tests/yamlparser/job_fixtures/jinja-include02.yaml diff --git a/tests/yamlparser/fixtures/jinja-string01.xml b/tests/yamlparser/job_fixtures/jinja-string01.xml similarity index 100% rename from tests/yamlparser/fixtures/jinja-string01.xml rename to tests/yamlparser/job_fixtures/jinja-string01.xml diff --git a/tests/yamlparser/fixtures/jinja-string01.yaml b/tests/yamlparser/job_fixtures/jinja-string01.yaml similarity index 100% rename from tests/yamlparser/fixtures/jinja-string01.yaml rename to tests/yamlparser/job_fixtures/jinja-string01.yaml diff --git a/tests/yamlparser/fixtures/jinja-string02.xml b/tests/yamlparser/job_fixtures/jinja-string02.xml similarity index 100% rename from tests/yamlparser/fixtures/jinja-string02.xml rename to tests/yamlparser/job_fixtures/jinja-string02.xml diff --git a/tests/yamlparser/fixtures/jinja-string02.yaml b/tests/yamlparser/job_fixtures/jinja-string02.yaml similarity index 100% rename from tests/yamlparser/fixtures/jinja-string02.yaml rename to tests/yamlparser/job_fixtures/jinja-string02.yaml diff --git a/tests/yamlparser/fixtures/jinja-string03.xml b/tests/yamlparser/job_fixtures/jinja-string03.xml similarity index 100% rename from tests/yamlparser/fixtures/jinja-string03.xml rename to tests/yamlparser/job_fixtures/jinja-string03.xml diff --git a/tests/yamlparser/fixtures/jinja-string03.yaml b/tests/yamlparser/job_fixtures/jinja-string03.yaml similarity index 100% rename from tests/yamlparser/fixtures/jinja-string03.yaml rename to tests/yamlparser/job_fixtures/jinja-string03.yaml diff --git a/tests/yamlparser/fixtures/jinja-string04.xml b/tests/yamlparser/job_fixtures/jinja-string04.xml similarity index 100% rename from tests/yamlparser/fixtures/jinja-string04.xml rename to tests/yamlparser/job_fixtures/jinja-string04.xml diff --git a/tests/yamlparser/fixtures/jinja-string04.yaml b/tests/yamlparser/job_fixtures/jinja-string04.yaml similarity index 100% rename from tests/yamlparser/fixtures/jinja-string04.yaml rename to tests/yamlparser/job_fixtures/jinja-string04.yaml diff --git a/tests/yamlparser/fixtures/jinja-yaml01.xml b/tests/yamlparser/job_fixtures/jinja-yaml01.xml similarity index 100% rename from tests/yamlparser/fixtures/jinja-yaml01.xml rename to tests/yamlparser/job_fixtures/jinja-yaml01.xml diff --git a/tests/yamlparser/fixtures/jinja-yaml01.yaml b/tests/yamlparser/job_fixtures/jinja-yaml01.yaml similarity index 100% rename from tests/yamlparser/fixtures/jinja-yaml01.yaml rename to tests/yamlparser/job_fixtures/jinja-yaml01.yaml diff --git a/tests/yamlparser/fixtures/jinja-yaml02.xml b/tests/yamlparser/job_fixtures/jinja-yaml02.xml similarity index 100% rename from tests/yamlparser/fixtures/jinja-yaml02.xml rename to tests/yamlparser/job_fixtures/jinja-yaml02.xml diff --git a/tests/yamlparser/fixtures/jinja-yaml02.yaml b/tests/yamlparser/job_fixtures/jinja-yaml02.yaml similarity index 100% rename from tests/yamlparser/fixtures/jinja-yaml02.yaml rename to tests/yamlparser/job_fixtures/jinja-yaml02.yaml diff --git a/tests/yamlparser/fixtures/jinja-yaml03.groovy b/tests/yamlparser/job_fixtures/jinja-yaml03.groovy similarity index 100% rename from tests/yamlparser/fixtures/jinja-yaml03.groovy rename to tests/yamlparser/job_fixtures/jinja-yaml03.groovy diff --git a/tests/yamlparser/fixtures/jinja-yaml03.xml b/tests/yamlparser/job_fixtures/jinja-yaml03.xml similarity index 100% rename from tests/yamlparser/fixtures/jinja-yaml03.xml rename to tests/yamlparser/job_fixtures/jinja-yaml03.xml diff --git a/tests/yamlparser/fixtures/jinja-yaml03.yaml b/tests/yamlparser/job_fixtures/jinja-yaml03.yaml similarity index 100% rename from tests/yamlparser/fixtures/jinja-yaml03.yaml rename to tests/yamlparser/job_fixtures/jinja-yaml03.yaml diff --git a/tests/yamlparser/fixtures/jinja-yaml04-deepcopy.xml b/tests/yamlparser/job_fixtures/jinja-yaml04-deepcopy.xml similarity index 100% rename from tests/yamlparser/fixtures/jinja-yaml04-deepcopy.xml rename to tests/yamlparser/job_fixtures/jinja-yaml04-deepcopy.xml diff --git a/tests/yamlparser/fixtures/jinja-yaml04-deepcopy.yaml b/tests/yamlparser/job_fixtures/jinja-yaml04-deepcopy.yaml similarity index 100% rename from tests/yamlparser/fixtures/jinja-yaml04-deepcopy.yaml rename to tests/yamlparser/job_fixtures/jinja-yaml04-deepcopy.yaml diff --git a/tests/yamlparser/fixtures/jinja01.xml b/tests/yamlparser/job_fixtures/jinja01.xml similarity index 100% rename from tests/yamlparser/fixtures/jinja01.xml rename to tests/yamlparser/job_fixtures/jinja01.xml diff --git a/tests/yamlparser/fixtures/jinja01.yaml b/tests/yamlparser/job_fixtures/jinja01.yaml similarity index 100% rename from tests/yamlparser/fixtures/jinja01.yaml rename to tests/yamlparser/job_fixtures/jinja01.yaml diff --git a/tests/yamlparser/fixtures/jinja01.yaml.inc b/tests/yamlparser/job_fixtures/jinja01.yaml.inc similarity index 100% rename from tests/yamlparser/fixtures/jinja01.yaml.inc rename to tests/yamlparser/job_fixtures/jinja01.yaml.inc diff --git a/tests/yamlparser/fixtures/jinja02.xml b/tests/yamlparser/job_fixtures/jinja02.xml similarity index 100% rename from tests/yamlparser/fixtures/jinja02.xml rename to tests/yamlparser/job_fixtures/jinja02.xml diff --git a/tests/yamlparser/fixtures/jinja02.yaml b/tests/yamlparser/job_fixtures/jinja02.yaml similarity index 100% rename from tests/yamlparser/fixtures/jinja02.yaml rename to tests/yamlparser/job_fixtures/jinja02.yaml diff --git a/tests/yamlparser/fixtures/jinja02.yaml.inc b/tests/yamlparser/job_fixtures/jinja02.yaml.inc similarity index 100% rename from tests/yamlparser/fixtures/jinja02.yaml.inc rename to tests/yamlparser/job_fixtures/jinja02.yaml.inc diff --git a/tests/yamlparser/fixtures/jinja03.xml b/tests/yamlparser/job_fixtures/jinja03.xml similarity index 100% rename from tests/yamlparser/fixtures/jinja03.xml rename to tests/yamlparser/job_fixtures/jinja03.xml diff --git a/tests/yamlparser/fixtures/jinja03.yaml b/tests/yamlparser/job_fixtures/jinja03.yaml similarity index 100% rename from tests/yamlparser/fixtures/jinja03.yaml rename to tests/yamlparser/job_fixtures/jinja03.yaml diff --git a/tests/yamlparser/fixtures/jinja03.yaml.inc b/tests/yamlparser/job_fixtures/jinja03.yaml.inc similarity index 100% rename from tests/yamlparser/fixtures/jinja03.yaml.inc rename to tests/yamlparser/job_fixtures/jinja03.yaml.inc diff --git a/tests/yamlparser/fixtures/job-parameter-precedence.xml b/tests/yamlparser/job_fixtures/job-parameter-precedence.xml similarity index 100% rename from tests/yamlparser/fixtures/job-parameter-precedence.xml rename to tests/yamlparser/job_fixtures/job-parameter-precedence.xml diff --git a/tests/yamlparser/fixtures/job-parameter-precedence.yaml b/tests/yamlparser/job_fixtures/job-parameter-precedence.yaml similarity index 100% rename from tests/yamlparser/fixtures/job-parameter-precedence.yaml rename to tests/yamlparser/job_fixtures/job-parameter-precedence.yaml diff --git a/tests/yamlparser/fixtures/jobgroups_multi_use.xml b/tests/yamlparser/job_fixtures/jobgroups_multi_use.xml similarity index 100% rename from tests/yamlparser/fixtures/jobgroups_multi_use.xml rename to tests/yamlparser/job_fixtures/jobgroups_multi_use.xml diff --git a/tests/yamlparser/fixtures/jobgroups_multi_use.yaml b/tests/yamlparser/job_fixtures/jobgroups_multi_use.yaml similarity index 100% rename from tests/yamlparser/fixtures/jobgroups_multi_use.yaml rename to tests/yamlparser/job_fixtures/jobgroups_multi_use.yaml diff --git a/tests/yamlparser/fixtures/lazy-load-jinja001.xml b/tests/yamlparser/job_fixtures/lazy-load-jinja001.xml similarity index 100% rename from tests/yamlparser/fixtures/lazy-load-jinja001.xml rename to tests/yamlparser/job_fixtures/lazy-load-jinja001.xml diff --git a/tests/yamlparser/fixtures/lazy-load-jinja001.yaml b/tests/yamlparser/job_fixtures/lazy-load-jinja001.yaml similarity index 100% rename from tests/yamlparser/fixtures/lazy-load-jinja001.yaml rename to tests/yamlparser/job_fixtures/lazy-load-jinja001.yaml diff --git a/tests/yamlparser/fixtures/lazy-load-jobs-copy-files.yaml.inc b/tests/yamlparser/job_fixtures/lazy-load-jobs-copy-files.yaml.inc similarity index 100% rename from tests/yamlparser/fixtures/lazy-load-jobs-copy-files.yaml.inc rename to tests/yamlparser/job_fixtures/lazy-load-jobs-copy-files.yaml.inc diff --git a/tests/yamlparser/fixtures/lazy-load-jobs-multi001.xml b/tests/yamlparser/job_fixtures/lazy-load-jobs-multi001.xml similarity index 100% rename from tests/yamlparser/fixtures/lazy-load-jobs-multi001.xml rename to tests/yamlparser/job_fixtures/lazy-load-jobs-multi001.xml diff --git a/tests/yamlparser/fixtures/lazy-load-jobs-multi001.yaml b/tests/yamlparser/job_fixtures/lazy-load-jobs-multi001.yaml similarity index 100% rename from tests/yamlparser/fixtures/lazy-load-jobs-multi001.yaml rename to tests/yamlparser/job_fixtures/lazy-load-jobs-multi001.yaml diff --git a/tests/yamlparser/fixtures/lazy-load-jobs-multi002.xml b/tests/yamlparser/job_fixtures/lazy-load-jobs-multi002.xml similarity index 100% rename from tests/yamlparser/fixtures/lazy-load-jobs-multi002.xml rename to tests/yamlparser/job_fixtures/lazy-load-jobs-multi002.xml diff --git a/tests/yamlparser/fixtures/lazy-load-jobs-multi002.yaml b/tests/yamlparser/job_fixtures/lazy-load-jobs-multi002.yaml similarity index 100% rename from tests/yamlparser/fixtures/lazy-load-jobs-multi002.yaml rename to tests/yamlparser/job_fixtures/lazy-load-jobs-multi002.yaml diff --git a/tests/yamlparser/fixtures/lazy-load-jobs-pre-scm-shell-ant.yaml.inc b/tests/yamlparser/job_fixtures/lazy-load-jobs-pre-scm-shell-ant.yaml.inc similarity index 100% rename from tests/yamlparser/fixtures/lazy-load-jobs-pre-scm-shell-ant.yaml.inc rename to tests/yamlparser/job_fixtures/lazy-load-jobs-pre-scm-shell-ant.yaml.inc diff --git a/tests/yamlparser/fixtures/lazy-load-jobs-timeout.yaml.inc b/tests/yamlparser/job_fixtures/lazy-load-jobs-timeout.yaml.inc similarity index 100% rename from tests/yamlparser/fixtures/lazy-load-jobs-timeout.yaml.inc rename to tests/yamlparser/job_fixtures/lazy-load-jobs-timeout.yaml.inc diff --git a/tests/yamlparser/job_fixtures/lazy-load-jobs001.conf b/tests/yamlparser/job_fixtures/lazy-load-jobs001.conf new file mode 100644 index 000000000..dd362ddcd --- /dev/null +++ b/tests/yamlparser/job_fixtures/lazy-load-jobs001.conf @@ -0,0 +1,2 @@ +[job_builder] +include_path=tests/yamlparser/job_fixtures/lazy-load-scripts diff --git a/tests/yamlparser/fixtures/lazy-load-jobs001.xml b/tests/yamlparser/job_fixtures/lazy-load-jobs001.xml similarity index 100% rename from tests/yamlparser/fixtures/lazy-load-jobs001.xml rename to tests/yamlparser/job_fixtures/lazy-load-jobs001.xml diff --git a/tests/yamlparser/fixtures/lazy-load-jobs001.yaml b/tests/yamlparser/job_fixtures/lazy-load-jobs001.yaml similarity index 100% rename from tests/yamlparser/fixtures/lazy-load-jobs001.yaml rename to tests/yamlparser/job_fixtures/lazy-load-jobs001.yaml diff --git a/tests/yamlparser/fixtures/lazy-load-jobs002.xml b/tests/yamlparser/job_fixtures/lazy-load-jobs002.xml similarity index 100% rename from tests/yamlparser/fixtures/lazy-load-jobs002.xml rename to tests/yamlparser/job_fixtures/lazy-load-jobs002.xml diff --git a/tests/yamlparser/fixtures/lazy-load-jobs002.yaml b/tests/yamlparser/job_fixtures/lazy-load-jobs002.yaml similarity index 100% rename from tests/yamlparser/fixtures/lazy-load-jobs002.yaml rename to tests/yamlparser/job_fixtures/lazy-load-jobs002.yaml diff --git a/tests/yamlparser/fixtures/lazy-load-scripts/echo_vars_1.1.sh b/tests/yamlparser/job_fixtures/lazy-load-scripts/echo_vars_1.1.sh similarity index 100% rename from tests/yamlparser/fixtures/lazy-load-scripts/echo_vars_1.1.sh rename to tests/yamlparser/job_fixtures/lazy-load-scripts/echo_vars_1.1.sh diff --git a/tests/yamlparser/fixtures/lazy-load-scripts/echo_vars_1.2.sh b/tests/yamlparser/job_fixtures/lazy-load-scripts/echo_vars_1.2.sh similarity index 100% rename from tests/yamlparser/fixtures/lazy-load-scripts/echo_vars_1.2.sh rename to tests/yamlparser/job_fixtures/lazy-load-scripts/echo_vars_1.2.sh diff --git a/tests/yamlparser/fixtures/lazy-load-wrappers-1.1.yaml.inc b/tests/yamlparser/job_fixtures/lazy-load-wrappers-1.1.yaml.inc similarity index 100% rename from tests/yamlparser/fixtures/lazy-load-wrappers-1.1.yaml.inc rename to tests/yamlparser/job_fixtures/lazy-load-wrappers-1.1.yaml.inc diff --git a/tests/yamlparser/fixtures/lazy-load-wrappers-1.2.yaml.inc b/tests/yamlparser/job_fixtures/lazy-load-wrappers-1.2.yaml.inc similarity index 100% rename from tests/yamlparser/fixtures/lazy-load-wrappers-1.2.yaml.inc rename to tests/yamlparser/job_fixtures/lazy-load-wrappers-1.2.yaml.inc diff --git a/tests/yamlparser/fixtures/mask_internal_component.xml b/tests/yamlparser/job_fixtures/mask_internal_component.xml similarity index 100% rename from tests/yamlparser/fixtures/mask_internal_component.xml rename to tests/yamlparser/job_fixtures/mask_internal_component.xml diff --git a/tests/yamlparser/fixtures/mask_internal_component.yaml b/tests/yamlparser/job_fixtures/mask_internal_component.yaml similarity index 100% rename from tests/yamlparser/fixtures/mask_internal_component.yaml rename to tests/yamlparser/job_fixtures/mask_internal_component.yaml diff --git a/tests/yamlparser/fixtures/other_include_path/test.inc b/tests/yamlparser/job_fixtures/other_include_path/test.inc similarity index 100% rename from tests/yamlparser/fixtures/other_include_path/test.inc rename to tests/yamlparser/job_fixtures/other_include_path/test.inc diff --git a/tests/yamlparser/fixtures/project-in-folder-with-auth-properties.yaml b/tests/yamlparser/job_fixtures/project-in-folder-with-auth-properties.yaml similarity index 100% rename from tests/yamlparser/fixtures/project-in-folder-with-auth-properties.yaml rename to tests/yamlparser/job_fixtures/project-in-folder-with-auth-properties.yaml diff --git a/tests/yamlparser/fixtures/project-in-folder-with-auth-properties2.yaml b/tests/yamlparser/job_fixtures/project-in-folder-with-auth-properties2.yaml similarity index 100% rename from tests/yamlparser/fixtures/project-in-folder-with-auth-properties2.yaml rename to tests/yamlparser/job_fixtures/project-in-folder-with-auth-properties2.yaml diff --git a/tests/yamlparser/fixtures/project-matrix001.xml b/tests/yamlparser/job_fixtures/project-matrix001.xml similarity index 100% rename from tests/yamlparser/fixtures/project-matrix001.xml rename to tests/yamlparser/job_fixtures/project-matrix001.xml diff --git a/tests/yamlparser/fixtures/project-matrix001.yaml b/tests/yamlparser/job_fixtures/project-matrix001.yaml similarity index 100% rename from tests/yamlparser/fixtures/project-matrix001.yaml rename to tests/yamlparser/job_fixtures/project-matrix001.yaml diff --git a/tests/yamlparser/fixtures/project-matrix002.xml b/tests/yamlparser/job_fixtures/project-matrix002.xml similarity index 100% rename from tests/yamlparser/fixtures/project-matrix002.xml rename to tests/yamlparser/job_fixtures/project-matrix002.xml diff --git a/tests/yamlparser/fixtures/project-matrix002.yaml b/tests/yamlparser/job_fixtures/project-matrix002.yaml similarity index 100% rename from tests/yamlparser/fixtures/project-matrix002.yaml rename to tests/yamlparser/job_fixtures/project-matrix002.yaml diff --git a/tests/yamlparser/fixtures/project-with-auth-j2-yaml.xml b/tests/yamlparser/job_fixtures/project-with-auth-j2-yaml.xml similarity index 100% rename from tests/yamlparser/fixtures/project-with-auth-j2-yaml.xml rename to tests/yamlparser/job_fixtures/project-with-auth-j2-yaml.xml diff --git a/tests/yamlparser/fixtures/project-with-auth-j2-yaml.yaml b/tests/yamlparser/job_fixtures/project-with-auth-j2-yaml.yaml similarity index 100% rename from tests/yamlparser/fixtures/project-with-auth-j2-yaml.yaml rename to tests/yamlparser/job_fixtures/project-with-auth-j2-yaml.yaml diff --git a/tests/yamlparser/fixtures/project-with-auth-properties.xml b/tests/yamlparser/job_fixtures/project-with-auth-properties.xml similarity index 100% rename from tests/yamlparser/fixtures/project-with-auth-properties.xml rename to tests/yamlparser/job_fixtures/project-with-auth-properties.xml diff --git a/tests/yamlparser/fixtures/project-with-auth-properties.yaml b/tests/yamlparser/job_fixtures/project-with-auth-properties.yaml similarity index 100% rename from tests/yamlparser/fixtures/project-with-auth-properties.yaml rename to tests/yamlparser/job_fixtures/project-with-auth-properties.yaml diff --git a/tests/yamlparser/fixtures/project_flow_template001.xml b/tests/yamlparser/job_fixtures/project_flow_template001.xml similarity index 100% rename from tests/yamlparser/fixtures/project_flow_template001.xml rename to tests/yamlparser/job_fixtures/project_flow_template001.xml diff --git a/tests/yamlparser/fixtures/project_flow_template001.yaml b/tests/yamlparser/job_fixtures/project_flow_template001.yaml similarity index 100% rename from tests/yamlparser/fixtures/project_flow_template001.yaml rename to tests/yamlparser/job_fixtures/project_flow_template001.yaml diff --git a/tests/yamlparser/fixtures/project_flow_template002.xml b/tests/yamlparser/job_fixtures/project_flow_template002.xml similarity index 100% rename from tests/yamlparser/fixtures/project_flow_template002.xml rename to tests/yamlparser/job_fixtures/project_flow_template002.xml diff --git a/tests/yamlparser/fixtures/project_flow_template002.yaml b/tests/yamlparser/job_fixtures/project_flow_template002.yaml similarity index 100% rename from tests/yamlparser/fixtures/project_flow_template002.yaml rename to tests/yamlparser/job_fixtures/project_flow_template002.yaml diff --git a/tests/yamlparser/fixtures/project_flow_template003.xml b/tests/yamlparser/job_fixtures/project_flow_template003.xml similarity index 100% rename from tests/yamlparser/fixtures/project_flow_template003.xml rename to tests/yamlparser/job_fixtures/project_flow_template003.xml diff --git a/tests/yamlparser/fixtures/project_flow_template003.yaml b/tests/yamlparser/job_fixtures/project_flow_template003.yaml similarity index 100% rename from tests/yamlparser/fixtures/project_flow_template003.yaml rename to tests/yamlparser/job_fixtures/project_flow_template003.yaml diff --git a/tests/yamlparser/fixtures/project_folder_template001.xml b/tests/yamlparser/job_fixtures/project_folder_template001.xml similarity index 100% rename from tests/yamlparser/fixtures/project_folder_template001.xml rename to tests/yamlparser/job_fixtures/project_folder_template001.xml diff --git a/tests/yamlparser/fixtures/project_folder_template001.yaml b/tests/yamlparser/job_fixtures/project_folder_template001.yaml similarity index 100% rename from tests/yamlparser/fixtures/project_folder_template001.yaml rename to tests/yamlparser/job_fixtures/project_folder_template001.yaml diff --git a/tests/yamlparser/fixtures/project_folder_template002.xml b/tests/yamlparser/job_fixtures/project_folder_template002.xml similarity index 100% rename from tests/yamlparser/fixtures/project_folder_template002.xml rename to tests/yamlparser/job_fixtures/project_folder_template002.xml diff --git a/tests/yamlparser/fixtures/project_folder_template002.yaml b/tests/yamlparser/job_fixtures/project_folder_template002.yaml similarity index 100% rename from tests/yamlparser/fixtures/project_folder_template002.yaml rename to tests/yamlparser/job_fixtures/project_folder_template002.yaml diff --git a/tests/yamlparser/fixtures/project_folder_template003.xml b/tests/yamlparser/job_fixtures/project_folder_template003.xml similarity index 100% rename from tests/yamlparser/fixtures/project_folder_template003.xml rename to tests/yamlparser/job_fixtures/project_folder_template003.xml diff --git a/tests/yamlparser/fixtures/project_folder_template003.yaml b/tests/yamlparser/job_fixtures/project_folder_template003.yaml similarity index 100% rename from tests/yamlparser/fixtures/project_folder_template003.yaml rename to tests/yamlparser/job_fixtures/project_folder_template003.yaml diff --git a/tests/yamlparser/fixtures/project_pipeline_concurrent.xml b/tests/yamlparser/job_fixtures/project_pipeline_concurrent.xml similarity index 100% rename from tests/yamlparser/fixtures/project_pipeline_concurrent.xml rename to tests/yamlparser/job_fixtures/project_pipeline_concurrent.xml diff --git a/tests/yamlparser/fixtures/project_pipeline_concurrent.yaml b/tests/yamlparser/job_fixtures/project_pipeline_concurrent.yaml similarity index 100% rename from tests/yamlparser/fixtures/project_pipeline_concurrent.yaml rename to tests/yamlparser/job_fixtures/project_pipeline_concurrent.yaml diff --git a/tests/yamlparser/fixtures/project_pipeline_template001.xml b/tests/yamlparser/job_fixtures/project_pipeline_template001.xml similarity index 100% rename from tests/yamlparser/fixtures/project_pipeline_template001.xml rename to tests/yamlparser/job_fixtures/project_pipeline_template001.xml diff --git a/tests/yamlparser/fixtures/project_pipeline_template001.yaml b/tests/yamlparser/job_fixtures/project_pipeline_template001.yaml similarity index 100% rename from tests/yamlparser/fixtures/project_pipeline_template001.yaml rename to tests/yamlparser/job_fixtures/project_pipeline_template001.yaml diff --git a/tests/yamlparser/fixtures/project_pipeline_template002.xml b/tests/yamlparser/job_fixtures/project_pipeline_template002.xml similarity index 100% rename from tests/yamlparser/fixtures/project_pipeline_template002.xml rename to tests/yamlparser/job_fixtures/project_pipeline_template002.xml diff --git a/tests/yamlparser/fixtures/project_pipeline_template002.yaml b/tests/yamlparser/job_fixtures/project_pipeline_template002.yaml similarity index 100% rename from tests/yamlparser/fixtures/project_pipeline_template002.yaml rename to tests/yamlparser/job_fixtures/project_pipeline_template002.yaml diff --git a/tests/yamlparser/fixtures/project_pipeline_template003.xml b/tests/yamlparser/job_fixtures/project_pipeline_template003.xml similarity index 100% rename from tests/yamlparser/fixtures/project_pipeline_template003.xml rename to tests/yamlparser/job_fixtures/project_pipeline_template003.xml diff --git a/tests/yamlparser/fixtures/project_pipeline_template003.yaml b/tests/yamlparser/job_fixtures/project_pipeline_template003.yaml similarity index 100% rename from tests/yamlparser/fixtures/project_pipeline_template003.yaml rename to tests/yamlparser/job_fixtures/project_pipeline_template003.yaml diff --git a/tests/yamlparser/fixtures/project_pipeline_template004.xml b/tests/yamlparser/job_fixtures/project_pipeline_template004.xml similarity index 100% rename from tests/yamlparser/fixtures/project_pipeline_template004.xml rename to tests/yamlparser/job_fixtures/project_pipeline_template004.xml diff --git a/tests/yamlparser/fixtures/project_pipeline_template004.yaml b/tests/yamlparser/job_fixtures/project_pipeline_template004.yaml similarity index 100% rename from tests/yamlparser/fixtures/project_pipeline_template004.yaml rename to tests/yamlparser/job_fixtures/project_pipeline_template004.yaml diff --git a/tests/yamlparser/fixtures/project_pipeline_template005.xml b/tests/yamlparser/job_fixtures/project_pipeline_template005.xml similarity index 100% rename from tests/yamlparser/fixtures/project_pipeline_template005.xml rename to tests/yamlparser/job_fixtures/project_pipeline_template005.xml diff --git a/tests/yamlparser/fixtures/project_pipeline_template005.yaml b/tests/yamlparser/job_fixtures/project_pipeline_template005.yaml similarity index 100% rename from tests/yamlparser/fixtures/project_pipeline_template005.yaml rename to tests/yamlparser/job_fixtures/project_pipeline_template005.yaml diff --git a/tests/yamlparser/fixtures/project_pipeline_template006.xml b/tests/yamlparser/job_fixtures/project_pipeline_template006.xml similarity index 100% rename from tests/yamlparser/fixtures/project_pipeline_template006.xml rename to tests/yamlparser/job_fixtures/project_pipeline_template006.xml diff --git a/tests/yamlparser/fixtures/project_pipeline_template006.yaml b/tests/yamlparser/job_fixtures/project_pipeline_template006.yaml similarity index 100% rename from tests/yamlparser/fixtures/project_pipeline_template006.yaml rename to tests/yamlparser/job_fixtures/project_pipeline_template006.yaml diff --git a/tests/yamlparser/fixtures/project_pipeline_triggers.xml b/tests/yamlparser/job_fixtures/project_pipeline_triggers.xml similarity index 100% rename from tests/yamlparser/fixtures/project_pipeline_triggers.xml rename to tests/yamlparser/job_fixtures/project_pipeline_triggers.xml diff --git a/tests/yamlparser/fixtures/project_pipeline_triggers.yaml b/tests/yamlparser/job_fixtures/project_pipeline_triggers.yaml similarity index 100% rename from tests/yamlparser/fixtures/project_pipeline_triggers.yaml rename to tests/yamlparser/job_fixtures/project_pipeline_triggers.yaml diff --git a/tests/yamlparser/fixtures/project_workflow_template001.xml b/tests/yamlparser/job_fixtures/project_workflow_template001.xml similarity index 100% rename from tests/yamlparser/fixtures/project_workflow_template001.xml rename to tests/yamlparser/job_fixtures/project_workflow_template001.xml diff --git a/tests/yamlparser/fixtures/project_workflow_template001.yaml b/tests/yamlparser/job_fixtures/project_workflow_template001.yaml similarity index 100% rename from tests/yamlparser/fixtures/project_workflow_template001.yaml rename to tests/yamlparser/job_fixtures/project_workflow_template001.yaml diff --git a/tests/yamlparser/fixtures/project_workflow_template002.xml b/tests/yamlparser/job_fixtures/project_workflow_template002.xml similarity index 100% rename from tests/yamlparser/fixtures/project_workflow_template002.xml rename to tests/yamlparser/job_fixtures/project_workflow_template002.xml diff --git a/tests/yamlparser/fixtures/project_workflow_template002.yaml b/tests/yamlparser/job_fixtures/project_workflow_template002.yaml similarity index 100% rename from tests/yamlparser/fixtures/project_workflow_template002.yaml rename to tests/yamlparser/job_fixtures/project_workflow_template002.yaml diff --git a/tests/yamlparser/fixtures/project_workflow_template003.xml b/tests/yamlparser/job_fixtures/project_workflow_template003.xml similarity index 100% rename from tests/yamlparser/fixtures/project_workflow_template003.xml rename to tests/yamlparser/job_fixtures/project_workflow_template003.xml diff --git a/tests/yamlparser/fixtures/project_workflow_template003.yaml b/tests/yamlparser/job_fixtures/project_workflow_template003.yaml similarity index 100% rename from tests/yamlparser/fixtures/project_workflow_template003.yaml rename to tests/yamlparser/job_fixtures/project_workflow_template003.yaml diff --git a/tests/yamlparser/fixtures/python-jobs/folders-job-name.xml b/tests/yamlparser/job_fixtures/python-jobs/folders-job-name.xml similarity index 100% rename from tests/yamlparser/fixtures/python-jobs/folders-job-name.xml rename to tests/yamlparser/job_fixtures/python-jobs/folders-job-name.xml diff --git a/tests/yamlparser/fixtures/scm_remote_deep_bug.xml b/tests/yamlparser/job_fixtures/scm_remote_deep_bug.xml similarity index 100% rename from tests/yamlparser/fixtures/scm_remote_deep_bug.xml rename to tests/yamlparser/job_fixtures/scm_remote_deep_bug.xml diff --git a/tests/yamlparser/fixtures/scm_remote_deep_bug.yaml b/tests/yamlparser/job_fixtures/scm_remote_deep_bug.yaml similarity index 100% rename from tests/yamlparser/fixtures/scm_remote_deep_bug.yaml rename to tests/yamlparser/job_fixtures/scm_remote_deep_bug.yaml diff --git a/tests/yamlparser/fixtures/second_order_parameter_interpolation001.xml b/tests/yamlparser/job_fixtures/second_order_parameter_interpolation001.xml similarity index 100% rename from tests/yamlparser/fixtures/second_order_parameter_interpolation001.xml rename to tests/yamlparser/job_fixtures/second_order_parameter_interpolation001.xml diff --git a/tests/yamlparser/fixtures/second_order_parameter_interpolation001.yaml b/tests/yamlparser/job_fixtures/second_order_parameter_interpolation001.yaml similarity index 100% rename from tests/yamlparser/fixtures/second_order_parameter_interpolation001.yaml rename to tests/yamlparser/job_fixtures/second_order_parameter_interpolation001.yaml diff --git a/tests/yamlparser/fixtures/second_order_parameter_interpolation002.xml b/tests/yamlparser/job_fixtures/second_order_parameter_interpolation002.xml similarity index 100% rename from tests/yamlparser/fixtures/second_order_parameter_interpolation002.xml rename to tests/yamlparser/job_fixtures/second_order_parameter_interpolation002.xml diff --git a/tests/yamlparser/fixtures/second_order_parameter_interpolation002.yaml b/tests/yamlparser/job_fixtures/second_order_parameter_interpolation002.yaml similarity index 100% rename from tests/yamlparser/fixtures/second_order_parameter_interpolation002.yaml rename to tests/yamlparser/job_fixtures/second_order_parameter_interpolation002.yaml diff --git a/tests/yamlparser/fixtures/string_join.xml b/tests/yamlparser/job_fixtures/string_join.xml similarity index 100% rename from tests/yamlparser/fixtures/string_join.xml rename to tests/yamlparser/job_fixtures/string_join.xml diff --git a/tests/yamlparser/fixtures/string_join.yaml b/tests/yamlparser/job_fixtures/string_join.yaml similarity index 100% rename from tests/yamlparser/fixtures/string_join.yaml rename to tests/yamlparser/job_fixtures/string_join.yaml diff --git a/tests/yamlparser/fixtures/team1-jobs/ruby-jobs/folders-attribute.xml b/tests/yamlparser/job_fixtures/team1-jobs/ruby-jobs/folders-attribute.xml similarity index 100% rename from tests/yamlparser/fixtures/team1-jobs/ruby-jobs/folders-attribute.xml rename to tests/yamlparser/job_fixtures/team1-jobs/ruby-jobs/folders-attribute.xml diff --git a/tests/yamlparser/fixtures/template_default_variables.xml b/tests/yamlparser/job_fixtures/template_default_variables.xml similarity index 100% rename from tests/yamlparser/fixtures/template_default_variables.xml rename to tests/yamlparser/job_fixtures/template_default_variables.xml diff --git a/tests/yamlparser/fixtures/template_default_variables.yaml b/tests/yamlparser/job_fixtures/template_default_variables.yaml similarity index 100% rename from tests/yamlparser/fixtures/template_default_variables.yaml rename to tests/yamlparser/job_fixtures/template_default_variables.yaml diff --git a/tests/yamlparser/fixtures/template_exclude.xml b/tests/yamlparser/job_fixtures/template_exclude.xml similarity index 100% rename from tests/yamlparser/fixtures/template_exclude.xml rename to tests/yamlparser/job_fixtures/template_exclude.xml diff --git a/tests/yamlparser/fixtures/template_exclude.yaml b/tests/yamlparser/job_fixtures/template_exclude.yaml similarity index 100% rename from tests/yamlparser/fixtures/template_exclude.yaml rename to tests/yamlparser/job_fixtures/template_exclude.yaml diff --git a/tests/yamlparser/fixtures/template_honor_defaults.xml b/tests/yamlparser/job_fixtures/template_honor_defaults.xml similarity index 100% rename from tests/yamlparser/fixtures/template_honor_defaults.xml rename to tests/yamlparser/job_fixtures/template_honor_defaults.xml diff --git a/tests/yamlparser/fixtures/template_honor_defaults.yaml b/tests/yamlparser/job_fixtures/template_honor_defaults.yaml similarity index 100% rename from tests/yamlparser/fixtures/template_honor_defaults.yaml rename to tests/yamlparser/job_fixtures/template_honor_defaults.yaml diff --git a/tests/yamlparser/fixtures/template_ids.xml b/tests/yamlparser/job_fixtures/template_ids.xml similarity index 100% rename from tests/yamlparser/fixtures/template_ids.xml rename to tests/yamlparser/job_fixtures/template_ids.xml diff --git a/tests/yamlparser/fixtures/template_ids.yaml b/tests/yamlparser/job_fixtures/template_ids.yaml similarity index 100% rename from tests/yamlparser/fixtures/template_ids.yaml rename to tests/yamlparser/job_fixtures/template_ids.yaml diff --git a/tests/yamlparser/fixtures/template_override_project_level_defaults.plugins_info.yaml b/tests/yamlparser/job_fixtures/template_override_project_level_defaults.plugins_info.yaml similarity index 100% rename from tests/yamlparser/fixtures/template_override_project_level_defaults.plugins_info.yaml rename to tests/yamlparser/job_fixtures/template_override_project_level_defaults.plugins_info.yaml diff --git a/tests/yamlparser/fixtures/template_override_project_level_defaults.xml b/tests/yamlparser/job_fixtures/template_override_project_level_defaults.xml similarity index 100% rename from tests/yamlparser/fixtures/template_override_project_level_defaults.xml rename to tests/yamlparser/job_fixtures/template_override_project_level_defaults.xml diff --git a/tests/yamlparser/fixtures/template_override_project_level_defaults.yaml b/tests/yamlparser/job_fixtures/template_override_project_level_defaults.yaml similarity index 100% rename from tests/yamlparser/fixtures/template_override_project_level_defaults.yaml rename to tests/yamlparser/job_fixtures/template_override_project_level_defaults.yaml diff --git a/tests/yamlparser/fixtures/template_without_exclude.xml b/tests/yamlparser/job_fixtures/template_without_exclude.xml similarity index 100% rename from tests/yamlparser/fixtures/template_without_exclude.xml rename to tests/yamlparser/job_fixtures/template_without_exclude.xml diff --git a/tests/yamlparser/fixtures/template_without_exclude.yaml b/tests/yamlparser/job_fixtures/template_without_exclude.yaml similarity index 100% rename from tests/yamlparser/fixtures/template_without_exclude.yaml rename to tests/yamlparser/job_fixtures/template_without_exclude.yaml diff --git a/tests/yamlparser/fixtures/templates001.xml b/tests/yamlparser/job_fixtures/templates001.xml similarity index 100% rename from tests/yamlparser/fixtures/templates001.xml rename to tests/yamlparser/job_fixtures/templates001.xml diff --git a/tests/yamlparser/fixtures/templates001.yaml b/tests/yamlparser/job_fixtures/templates001.yaml similarity index 100% rename from tests/yamlparser/fixtures/templates001.yaml rename to tests/yamlparser/job_fixtures/templates001.yaml diff --git a/tests/yamlparser/fixtures/templates002.xml b/tests/yamlparser/job_fixtures/templates002.xml similarity index 100% rename from tests/yamlparser/fixtures/templates002.xml rename to tests/yamlparser/job_fixtures/templates002.xml diff --git a/tests/yamlparser/fixtures/templates002.yaml b/tests/yamlparser/job_fixtures/templates002.yaml similarity index 100% rename from tests/yamlparser/fixtures/templates002.yaml rename to tests/yamlparser/job_fixtures/templates002.yaml diff --git a/tests/yamlparser/fixtures/test.inc b/tests/yamlparser/job_fixtures/test.inc similarity index 100% rename from tests/yamlparser/fixtures/test.inc rename to tests/yamlparser/job_fixtures/test.inc diff --git a/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-001.plugins_info.yaml b/tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-001.plugins_info.yaml similarity index 100% rename from tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-001.plugins_info.yaml rename to tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-001.plugins_info.yaml diff --git a/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-001.xml b/tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-001.xml similarity index 100% rename from tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-001.xml rename to tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-001.xml diff --git a/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-001.yaml b/tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-001.yaml similarity index 100% rename from tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-001.yaml rename to tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-001.yaml diff --git a/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-002.plugins_info.yaml b/tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-002.plugins_info.yaml similarity index 100% rename from tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-002.plugins_info.yaml rename to tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-002.plugins_info.yaml diff --git a/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-002.xml b/tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-002.xml similarity index 100% rename from tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-002.xml rename to tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-002.xml diff --git a/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-002.yaml b/tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-002.yaml similarity index 100% rename from tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-002.yaml rename to tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-002.yaml diff --git a/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.plugins_info.yaml b/tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-003.plugins_info.yaml similarity index 100% rename from tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.plugins_info.yaml rename to tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-003.plugins_info.yaml diff --git a/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.xml b/tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-003.xml similarity index 100% rename from tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.xml rename to tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-003.xml diff --git a/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.yaml b/tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-003.yaml similarity index 100% rename from tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.yaml rename to tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-003.yaml diff --git a/tests/yamlparser/fixtures/unicode001.xml b/tests/yamlparser/job_fixtures/unicode001.xml similarity index 100% rename from tests/yamlparser/fixtures/unicode001.xml rename to tests/yamlparser/job_fixtures/unicode001.xml diff --git a/tests/yamlparser/fixtures/unicode001.yaml b/tests/yamlparser/job_fixtures/unicode001.yaml similarity index 100% rename from tests/yamlparser/fixtures/unicode001.yaml rename to tests/yamlparser/job_fixtures/unicode001.yaml diff --git a/tests/yamlparser/fixtures/unochoice/active-choices-param003.xml b/tests/yamlparser/job_fixtures/unochoice/active-choices-param003.xml similarity index 100% rename from tests/yamlparser/fixtures/unochoice/active-choices-param003.xml rename to tests/yamlparser/job_fixtures/unochoice/active-choices-param003.xml diff --git a/tests/yamlparser/fixtures/unochoice/dynamic-reference-param002.xml b/tests/yamlparser/job_fixtures/unochoice/dynamic-reference-param002.xml similarity index 100% rename from tests/yamlparser/fixtures/unochoice/dynamic-reference-param002.xml rename to tests/yamlparser/job_fixtures/unochoice/dynamic-reference-param002.xml diff --git a/tests/yamlparser/fixtures/var_applied_in_defaults.xml b/tests/yamlparser/job_fixtures/var_applied_in_defaults.xml similarity index 100% rename from tests/yamlparser/fixtures/var_applied_in_defaults.xml rename to tests/yamlparser/job_fixtures/var_applied_in_defaults.xml diff --git a/tests/yamlparser/fixtures/var_applied_in_defaults.yaml b/tests/yamlparser/job_fixtures/var_applied_in_defaults.yaml similarity index 100% rename from tests/yamlparser/fixtures/var_applied_in_defaults.yaml rename to tests/yamlparser/job_fixtures/var_applied_in_defaults.yaml diff --git a/tests/yamlparser/fixtures/variable_default_values.xml b/tests/yamlparser/job_fixtures/variable_default_values.xml similarity index 100% rename from tests/yamlparser/fixtures/variable_default_values.xml rename to tests/yamlparser/job_fixtures/variable_default_values.xml diff --git a/tests/yamlparser/fixtures/variable_default_values.yaml b/tests/yamlparser/job_fixtures/variable_default_values.yaml similarity index 100% rename from tests/yamlparser/fixtures/variable_default_values.yaml rename to tests/yamlparser/job_fixtures/variable_default_values.yaml diff --git a/tests/yamlparser/fixtures/variable_defaults.xml b/tests/yamlparser/job_fixtures/variable_defaults.xml similarity index 100% rename from tests/yamlparser/fixtures/variable_defaults.xml rename to tests/yamlparser/job_fixtures/variable_defaults.xml diff --git a/tests/yamlparser/fixtures/variable_defaults.yaml b/tests/yamlparser/job_fixtures/variable_defaults.yaml similarity index 100% rename from tests/yamlparser/fixtures/variable_defaults.yaml rename to tests/yamlparser/job_fixtures/variable_defaults.yaml diff --git a/tests/yamlparser/fixtures/variable_escaping.xml b/tests/yamlparser/job_fixtures/variable_escaping.xml similarity index 100% rename from tests/yamlparser/fixtures/variable_escaping.xml rename to tests/yamlparser/job_fixtures/variable_escaping.xml diff --git a/tests/yamlparser/fixtures/variable_escaping.yaml b/tests/yamlparser/job_fixtures/variable_escaping.yaml similarity index 100% rename from tests/yamlparser/fixtures/variable_escaping.yaml rename to tests/yamlparser/job_fixtures/variable_escaping.yaml diff --git a/tests/yamlparser/fixtures/yaml_anchor.xml b/tests/yamlparser/job_fixtures/yaml_anchor.xml similarity index 100% rename from tests/yamlparser/fixtures/yaml_anchor.xml rename to tests/yamlparser/job_fixtures/yaml_anchor.xml diff --git a/tests/yamlparser/fixtures/yaml_anchor.yaml b/tests/yamlparser/job_fixtures/yaml_anchor.yaml similarity index 100% rename from tests/yamlparser/fixtures/yaml_anchor.yaml rename to tests/yamlparser/job_fixtures/yaml_anchor.yaml diff --git a/tests/yamlparser/test_parser_exceptions.py b/tests/yamlparser/test_errors.py similarity index 88% rename from tests/yamlparser/test_parser_exceptions.py rename to tests/yamlparser/test_errors.py index e85725154..4bccb9910 100644 --- a/tests/yamlparser/test_parser_exceptions.py +++ b/tests/yamlparser/test_errors.py @@ -21,7 +21,7 @@ from pathlib import Path import pytest -exceptions_dir = Path(__file__).parent / "exceptions" +fixtures_dir = Path(__file__).parent / "error_fixtures" # Override to avoid scenarios usage. @@ -37,7 +37,7 @@ def plugins_info(): def test_incorrect_template_dimensions(caplog, check_parser): - in_path = exceptions_dir / "incorrect_template_dimensions.yaml" + in_path = fixtures_dir / "incorrect_template_dimensions.yaml" with pytest.raises(Exception) as excinfo: check_parser(in_path) assert "'NoneType' object is not iterable" in str(excinfo.value) @@ -46,7 +46,7 @@ def test_incorrect_template_dimensions(caplog, check_parser): @pytest.mark.parametrize("name", ["template", "params"]) def test_failure_formatting(caplog, check_parser, name): - in_path = exceptions_dir / f"failure_formatting_{name}.yaml" + in_path = fixtures_dir / f"failure_formatting_{name}.yaml" with pytest.raises(Exception): check_parser(in_path) assert f"Failure formatting {name}" in caplog.text diff --git a/tests/yamlparser/test_jobs.py b/tests/yamlparser/test_jobs.py index 6c18fd22a..b8a4ff805 100644 --- a/tests/yamlparser/test_jobs.py +++ b/tests/yamlparser/test_jobs.py @@ -24,7 +24,7 @@ import pytest from tests.enum_scenarios import scenario_list -fixtures_dir = Path(__file__).parent / "fixtures" +fixtures_dir = Path(__file__).parent / "job_fixtures" @pytest.fixture(