zuul
/
zuul
Code Issues Proposed changes

Merge "Remove auto-add of localhost from unit test inventory"

This commit is contained in:
Zuul 2019-09-16 11:45:43 +00:00 committed by Gerrit Code Review
parent 68719b10b1 b6544f514f
commit afc0d62308
16 changed files with 61 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/base.py
View File

@ -1907,12 +1907,6 @@ class RecordingAnsibleJob(zuul.executor.server.AnsibleJob):
for host in hosts:
if not host['host_vars'].get('ansible_connection'):
host['host_vars']['ansible_connection'] = 'local'
if not hosts:
hosts.append(dict(
name='localhost',
host_vars=dict(ansible_connection='local'),
host_keys=[]))
return hosts
def pause(self):

4
tests/fixtures/config/ansible/git/common-config/zuul.yaml vendored
View File

@ -81,6 +81,10 @@
vars:
base_var: 'base_var'
parent: null
nodeset:
nodes:
- name: test_node
label: test_label
- job:
name: base-urls

4
tests/fixtures/config/cleanup-playbook/git/common-config/zuul.yaml vendored
View File

@ -15,6 +15,10 @@
- job:
name: base
parent: null
nodeset:
nodes:
- name: test_node
label: test_label
- job:
name: python27

4
tests/fixtures/config/gerrit-file-comments/git/common-config/zuul.yaml vendored
View File

@ -15,3 +15,7 @@
- job:
name: base
parent: null
nodeset:
nodes:
- name: test_node
label: test_label

4
tests/fixtures/config/job-output/git/common-config/zuul.yaml vendored
View File

@ -15,6 +15,10 @@
- job:
name: base
parent: null
nodeset:
nodes:
- name: test_node
label: test_label
- job:
parent: base

4
tests/fixtures/config/job-pause/git/common-config/zuul.yaml vendored
View File

@ -15,3 +15,7 @@
- job:
name: base
parent: null
nodeset:
nodes:
- name: test_node
label: test_label

4
tests/fixtures/config/job-pause2/git/common-config/zuul.yaml vendored
View File

@ -15,3 +15,7 @@
- job:
name: base
parent: null
nodeset:
nodes:
- name: test_node
label: test_label

4
tests/fixtures/config/line-mapping/git/common-config/zuul.yaml vendored
View File

@ -15,3 +15,7 @@
- job:
name: base
parent: null
nodeset:
nodes:
- name: test_node
label: test_label

4
tests/fixtures/config/post-playbook/git/common-config/zuul.yaml vendored
View File

@ -15,6 +15,10 @@
- job:
name: base
parent: null
nodeset:
nodes:
- name: test_node
label: test_label
- job:
name: python27

4
tests/fixtures/config/pre-playbook/git/common-config/zuul.yaml vendored
View File

@ -15,6 +15,10 @@
- job:
name: base
parent: null
nodeset:
nodes:
- name: test_node
label: test_label
- job:
name: python27

4
tests/fixtures/config/provides-requires-pause/git/common-config/zuul.yaml vendored
View File

@ -36,3 +36,7 @@
- job:
name: base
parent: null
nodeset:
nodes:
- name: test_node
label: test_label

4
tests/fixtures/config/secret-leaks/git/common-config/zuul.yaml vendored
View File

@ -51,6 +51,10 @@
- job:
name: base
parent: null
nodeset:
nodes:
- name: test_node
label: test_label
- job:
parent: base

4
tests/fixtures/config/secrets/git/common-config/zuul.yaml vendored
View File

@ -36,3 +36,7 @@
- job:
name: base
parent: null
nodeset:
nodes:
- name: test_node
label: test_label

4
tests/fixtures/config/sql-driver/git/common-config/zuul.yaml vendored
View File

@ -63,6 +63,10 @@
- job:
name: base
parent: null
nodeset:
nodes:
- name: test_node
label: test_label
- job:
name: project-merge

4
tests/fixtures/config/streamer/git/common-config/zuul.yaml vendored
View File

@ -14,6 +14,10 @@
- job:
name: base
parent: null
nodeset:
nodes:
- name: test_node
label: test_label
- job:
name: python27

10
tests/unit/test_v3.py
View File

@ -4925,15 +4925,15 @@ class TestJobOutput(AnsibleZuulTestCase):
'work/logs/job-output.json'))
self.assertEqual(token,
j[0]['plays'][0]['tasks'][0]
['hosts']['localhost']['stdout'])
['hosts']['test_node']['stdout'])
self.assertTrue(j[0]['plays'][0]['tasks'][1]
['hosts']['localhost']['skipped'])
['hosts']['test_node']['skipped'])
self.assertTrue(j[0]['plays'][0]['tasks'][2]
['hosts']['localhost']['failed'])
['hosts']['test_node']['failed'])
self.assertEqual(
"This is a handler",
j[0]['plays'][0]['tasks'][3]
['hosts']['localhost']['stdout'])
['hosts']['test_node']['stdout'])
self.log.info(self._get_file(self.history[0],
'work/logs/job-output.txt'))
@ -4983,7 +4983,7 @@ class TestJobOutput(AnsibleZuulTestCase):
'work/logs/job-output.json'))
self.assertEqual(token,
j[0]['plays'][0]['tasks'][0]
['hosts']['localhost']['stdout'])
['hosts']['test_node']['stdout'])
self.log.info(self._get_file(self.history[0],
'work/logs/job-output.json'))