Move test_model.test_job_inheritance_configloader
This test (and others like it) are difficult to maintain because
they rely heavily on internal interfaces which we change frequently.
Now that more of the framework is in place, make it more of a
functional test where we validate the output of the whole system.
Change-Id: Ib987b4a289682e87c5192043c05efb085fee5942
diff --git a/tests/base.py b/tests/base.py
index d3c5d62..2da4d47 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -67,6 +67,7 @@
import zuul.model
import zuul.nodepool
import zuul.zk
+import zuul.configloader
from zuul.exceptions import MergeFailure
FIXTURE_DIR = os.path.join(os.path.dirname(__file__),
@@ -2231,6 +2232,14 @@
if 'job' in item:
jobname = item['job']['name']
files['playbooks/%s.yaml' % jobname] = ''
+ if 'run' in item['job']:
+ files['%s.yaml' % item['job']['run']] = ''
+ for fn in zuul.configloader.as_list(
+ item['job'].get('pre-run', [])):
+ files['%s.yaml' % fn] = ''
+ for fn in zuul.configloader.as_list(
+ item['job'].get('post-run', [])):
+ files['%s.yaml' % fn] = ''
root = os.path.join(self.test_root, "config")
if not os.path.exists(root):