Update test fixtures to use explicit run
Change-Id: I3060a2bf57cef10a5a7ec5299e3491f1f6751221
diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py
index 1b5f9dd..e30a43d 100755
--- a/tests/unit/test_scheduler.py
+++ b/tests/unit/test_scheduler.py
@@ -2460,7 +2460,7 @@
self.assertEqual([x['path'] for x in p['post_playbooks']],
['py27-post-a', 'py27-post-b', 'base-post'])
self.assertEqual([x['path'] for x in p['playbooks']],
- ['playbooks/python27', 'playbooks/base'])
+ ['playbooks/python27.yaml'])
p = self.history[1].parameters
self.assertEqual(p['timeout'], 50)
@@ -2484,7 +2484,7 @@
['py27-essex-post', 'py27-post-a', 'py27-post-b',
'base-post'])
self.assertEqual([x['path'] for x in p['playbooks']],
- ['playbooks/python27', 'playbooks/base'])
+ ['playbooks/python27.yaml'])
def test_queue_names(self):
"Test shared change queue names"
@@ -5879,6 +5879,7 @@
- job:
name: project-test2
+ run: playbooks/project-test2.yaml
semaphore: test-semaphore
- project:
diff --git a/tests/unit/test_v3.py b/tests/unit/test_v3.py
index b9ae04b..80e6ccc 100755
--- a/tests/unit/test_v3.py
+++ b/tests/unit/test_v3.py
@@ -128,6 +128,7 @@
- job:
name: project-test
parent: job-final
+ run: playbooks/project-test.yaml
- project:
name: org/project
@@ -310,6 +311,7 @@
- job:
name: project-test2
+ run: playbooks/project-test2.yaml
- project:
name: org/project
@@ -460,9 +462,11 @@
"""
- job:
name: project-test1
+ run: playbooks/project-test1.yaml
- job:
name: project-test2
+ run: playbooks/project-test2.yaml
- project:
name: org/project
@@ -493,9 +497,11 @@
"""
- job:
name: project-test1
+ run: playbooks/project-test1.yaml
- job:
name: project-test2
+ run: playbooks/project-test2.yaml
- project:
name: org/project
@@ -536,6 +542,7 @@
- job:
name: project-test2
+ run: playbooks/project-test2.yaml
- project:
name: org/project
@@ -608,6 +615,7 @@
- job:
name: project-test2
+ run: playbooks/project-test2.yaml
- project:
name: org/project
@@ -1075,6 +1083,7 @@
"""
- job:
name: project-test1
+ run: playbooks/project-test1.yaml
- project-template:
name: some-jobs
tenant-one-gate:
@@ -1133,6 +1142,7 @@
"""
- job:
name: project-test1
+ run: playbooks/project-test1.yaml
- project:
name: org/project1
@@ -1187,6 +1197,7 @@
"""
- job:
name: project-test1
+ run: playbooks/project-test1.yaml
- job:
name: project-test2
@@ -1303,9 +1314,11 @@
"""
- job:
name: project-test1
+ run: playbooks/project-test1.yaml
- job:
name: project-test2
+ run: playbooks/project-test2.yaml
- project:
name: org/project
@@ -1349,6 +1362,7 @@
"""
- job:
name: project-test1
+ run: playbooks/project-test1.yaml
- project:
name: org/project
@@ -1482,13 +1496,14 @@
"""
- job:
name: %s
+ run: playbooks/%s.yaml
- project:
name: org/plugin-project
check:
jobs:
- %s
- """ % (job_name, job_name))
+ """ % (job_name, job_name, job_name))
file_dict = {'.zuul.yaml': conf}
A = self.fake_gerrit.addFakeChange('org/plugin-project', 'master', 'A',
@@ -1690,6 +1705,7 @@
- job:
name: project-test
parent: parent
+ run: playbooks/project-test.yaml
roles:
- zuul: org/project
@@ -1726,6 +1742,7 @@
"""
- job:
name: project-test
+ run: playbooks/project-test.yaml
roles:
- zuul: common-config
@@ -2014,7 +2031,7 @@
'username': 'test-username'}
self.assertEqual(
self._getSecrets('trusted-secrets', 'playbooks'),
- [{'trusted-secret': secret}, {}])
+ [{'trusted-secret': secret}])
self.assertEqual(
self._getSecrets('trusted-secrets', 'pre_playbooks'), [])
self.assertEqual(
@@ -2022,8 +2039,7 @@
self.assertEqual(
self._getSecrets('trusted-secrets-trusted-child',
- 'playbooks'),
- [{}, {'trusted-secret': secret}, {}])
+ 'playbooks'), [{}])
self.assertEqual(
self._getSecrets('trusted-secrets-trusted-child',
'pre_playbooks'), [])
@@ -2033,8 +2049,7 @@
self.assertEqual(
self._getSecrets('trusted-secrets-untrusted-child',
- 'playbooks'),
- [{}, {'trusted-secret': secret}, {}])
+ 'playbooks'), [{}])
self.assertEqual(
self._getSecrets('trusted-secrets-untrusted-child',
'pre_playbooks'), [])
@@ -2048,7 +2063,7 @@
'username': 'test-username'}
self.assertEqual(
self._getSecrets('untrusted-secrets', 'playbooks'),
- [{'untrusted-secret': secret}, {}])
+ [{'untrusted-secret': secret}])
self.assertEqual(
self._getSecrets('untrusted-secrets', 'pre_playbooks'), [])
self.assertEqual(
@@ -2056,8 +2071,7 @@
self.assertEqual(
self._getSecrets('untrusted-secrets-trusted-child',
- 'playbooks'),
- [{}, {'untrusted-secret': secret}, {}])
+ 'playbooks'), [{}])
self.assertEqual(
self._getSecrets('untrusted-secrets-trusted-child',
'pre_playbooks'), [])
@@ -2067,8 +2081,7 @@
self.assertEqual(
self._getSecrets('untrusted-secrets-untrusted-child',
- 'playbooks'),
- [{}, {'untrusted-secret': secret}, {}])
+ 'playbooks'), [{}])
self.assertEqual(
self._getSecrets('untrusted-secrets-untrusted-child',
'pre_playbooks'), [])