diff --git a/jenkins_jobs/modules/scm.py b/jenkins_jobs/modules/scm.py index 59adf91f3..f24a7afcd 100644 --- a/jenkins_jobs/modules/scm.py +++ b/jenkins_jobs/modules/scm.py @@ -28,7 +28,7 @@ SCMs plugin. `_ Example of multiple repositories in a single job: - .. literalinclude:: /../../tests/macros/scm/multi-scms001.yaml + .. literalinclude:: /../../tests/macros/fixtures/scm/multi-scms001.yaml """ import logging diff --git a/tests/macros/scm/multi-scms001.xml b/tests/macros/fixtures/scm/multi-scms001.xml similarity index 100% rename from tests/macros/scm/multi-scms001.xml rename to tests/macros/fixtures/scm/multi-scms001.xml diff --git a/tests/macros/scm/multi-scms001.yaml b/tests/macros/fixtures/scm/multi-scms001.yaml similarity index 100% rename from tests/macros/scm/multi-scms001.yaml rename to tests/macros/fixtures/scm/multi-scms001.yaml diff --git a/tests/macros/scm/multi-scms002.xml b/tests/macros/fixtures/scm/multi-scms002.xml similarity index 100% rename from tests/macros/scm/multi-scms002.xml rename to tests/macros/fixtures/scm/multi-scms002.xml diff --git a/tests/macros/scm/multi-scms002.yaml b/tests/macros/fixtures/scm/multi-scms002.yaml similarity index 100% rename from tests/macros/scm/multi-scms002.yaml rename to tests/macros/fixtures/scm/multi-scms002.yaml diff --git a/tests/macros/scm/scm001.xml b/tests/macros/fixtures/scm/scm001.xml similarity index 100% rename from tests/macros/scm/scm001.xml rename to tests/macros/fixtures/scm/scm001.xml diff --git a/tests/macros/scm/scm001.yaml b/tests/macros/fixtures/scm/scm001.yaml similarity index 100% rename from tests/macros/scm/scm001.yaml rename to tests/macros/fixtures/scm/scm001.yaml diff --git a/tests/macros/scm/scm002.xml b/tests/macros/fixtures/scm/scm002.xml similarity index 100% rename from tests/macros/scm/scm002.xml rename to tests/macros/fixtures/scm/scm002.xml diff --git a/tests/macros/scm/scm002.yaml b/tests/macros/fixtures/scm/scm002.yaml similarity index 100% rename from tests/macros/scm/scm002.yaml rename to tests/macros/fixtures/scm/scm002.yaml diff --git a/tests/macros/test_macros.py b/tests/macros/test_macros.py index b486dfa90..4023bb97a 100644 --- a/tests/macros/test_macros.py +++ b/tests/macros/test_macros.py @@ -22,5 +22,5 @@ from tests.base import get_scenarios, SingleJobTestCase class TestCaseModuleSCMMacro(TestWithScenarios, TestCase, SingleJobTestCase): - fixtures_path = os.path.join(os.path.dirname(__file__), 'scm') + fixtures_path = os.path.join(os.path.dirname(__file__), 'fixtures') scenarios = get_scenarios(fixtures_path)