Merge "Change test folder name to 'fixture' for consistency"

jenkins_jobs/modules/scm.py

@@ -27,7 +27,7 @@ Note: Adding more than one scm definition requires the Jenkins
 :jenkins-wiki:`Multiple SCMs plugin <Multiple+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

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)