recordsansible
/
ara
Code Issues Proposed changes

Update integration jobs and fix broken unit tests 

The release of Ansible 2.5 broke some unit tests that are fixed in
this commit.
We're also updating the versions of things we're testing.

Change-Id: I4774a26395f56918d9c982128cf8844585d82465
This commit is contained in:
David Moreau Simard 2018-04-04 18:46:42 -04:00
parent a53680313a
commit b030fb097e
No known key found for this signature in database
GPG Key ID: 33A07694CBB71ECC
5 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.rst
View File

@ -112,13 +112,11 @@ regressions. Here's our current testing coverage:
+------------------+--------+--------+----------+--------+--------+ +------------------+--------+--------+----------+--------+--------+
| - | Fedora | CentOS | OpenSUSE | Debian | Ubuntu | | - | Fedora | CentOS | OpenSUSE | Debian | Ubuntu |
+==================+========+========+==========+========+========+ +==================+========+========+==========+========+========+
| Ansible 2.2.3.0 | | | | X | | | Ansible 2.4.3.0 | | X | | X | |
+------------------+--------+--------+----------+--------+--------+ +------------------+--------+--------+----------+--------+--------+
| Ansible 2.3.2.0 | | X | | | | | Ansible 2.5.0 | X | | X | | X |
+------------------+--------+--------+----------+--------+--------+ +------------------+--------+--------+----------+--------+--------+
| Ansible "latest" | X | | X | | X | | Ansible "devel" | X | | | | X |
+------------------+--------+--------+----------+--------+--------+
| Ansible "devel" | X | | | | X |
+------------------+--------+--------+----------+--------+--------+ +------------------+--------+--------+----------+--------+--------+
You might also be interested in reading the project manifesto_ in order to have You might also be interested in reading the project manifesto_ in order to have

5
ara/tests/unit/test_ara_read.py
View File

@ -121,6 +121,7 @@ class TestRead(TestAra):
self.task = MagicMock(Task) self.task = MagicMock(Task)
self.task.async = 0 self.task.async = 0
self.task.async_val = False
self.task.args = { self.task.args = {
'key': 'test-key', 'key': 'test-key',
'value': 'test-value', 'value': 'test-value',
@ -162,6 +163,7 @@ class TestRead(TestAra):
def _test_task(self, playbook): def _test_task(self, playbook):
name = 'test-task-%s' % self.tag name = 'test-task-%s' % self.tag
task = Task(name, playbook.path) task = Task(name, playbook.path)
task.async_val = False
self.cb.v2_playbook_on_task_start(task, False) self.cb.v2_playbook_on_task_start(task, False)
return task return task
@ -174,6 +176,7 @@ class TestRead(TestAra):
task = MagicMock(Task) task = MagicMock(Task)
task.async = 0 task.async = 0
task.async_val = False
task.args = { task.args = {
'playbook': r_playbook.id, 'playbook': r_playbook.id,
'key': 'test-key', 'key': 'test-key',
@ -203,6 +206,7 @@ class TestRead(TestAra):
""" """
task = MagicMock(Task) task = MagicMock(Task)
task.async = 0 task.async = 0
task.async_val = False
task.args = { task.args = {
'key': 'test-key', 'key': 'test-key',
} }
@ -234,6 +238,7 @@ class TestRead(TestAra):
""" """
task = MagicMock(Task) task = MagicMock(Task)
task.async = 0 task.async = 0
task.async_val = False
task.args = { task.args = {
'key': 'key', 'key': 'key',
} }

11
ara/tests/unit/test_ara_record.py
View File

@ -159,6 +159,7 @@ class TestRecord(TestAra):
task = MagicMock(Task) task = MagicMock(Task)
task.async = 0 task.async = 0
task.async_val = False
task.args = { task.args = {
'playbook': r_playbook.id, 'playbook': r_playbook.id,
'key': 'test-text', 'key': 'test-text',
@ -185,6 +186,7 @@ class TestRecord(TestAra):
""" """
task = MagicMock(Task) task = MagicMock(Task)
task.async = 0 task.async = 0
task.async_val = False
task.args = { task.args = {
'key': 'test-text', 'key': 'test-text',
'value': 'test-value', 'value': 'test-value',
@ -213,6 +215,7 @@ class TestRecord(TestAra):
""" """
task = MagicMock(Task) task = MagicMock(Task)
task.async = 0 task.async = 0
task.async_val = False
task.args = { task.args = {
'key': 'test-url', 'key': 'test-url',
'value': 'http://url', 'value': 'http://url',
@ -241,6 +244,7 @@ class TestRecord(TestAra):
""" """
task = MagicMock(Task) task = MagicMock(Task)
task.async = 0 task.async = 0
task.async_val = False
task.args = { task.args = {
'key': 'test-json', 'key': 'test-json',
'value': '{"foo": "bar"}', 'value': '{"foo": "bar"}',
@ -269,6 +273,7 @@ class TestRecord(TestAra):
""" """
task = MagicMock(Task) task = MagicMock(Task)
task.async = 0 task.async = 0
task.async_val = False
task.args = { task.args = {
'key': 'test-list', 'key': 'test-list',
'value': ['foo', 'bar'], 'value': ['foo', 'bar'],
@ -297,6 +302,7 @@ class TestRecord(TestAra):
""" """
task = MagicMock(Task) task = MagicMock(Task)
task.async = 0 task.async = 0
task.async_val = False
task.args = { task.args = {
'key': 'test-dict', 'key': 'test-dict',
'value': {'foo': 'bar'}, 'value': {'foo': 'bar'},
@ -325,6 +331,7 @@ class TestRecord(TestAra):
""" """
task = MagicMock(Task) task = MagicMock(Task)
task.async = 0 task.async = 0
task.async_val = False
task.args = { task.args = {
'key': 'test-notype', 'key': 'test-notype',
'value': 'test-value' 'value': 'test-value'
@ -352,6 +359,7 @@ class TestRecord(TestAra):
""" """
task = MagicMock(Task) task = MagicMock(Task)
task.async = 0 task.async = 0
task.async_val = False
task.args = { task.args = {
'key': 'test-wrongtype', 'key': 'test-wrongtype',
'value': ['foo', 'bar'], 'value': ['foo', 'bar'],
@ -381,6 +389,7 @@ class TestRecord(TestAra):
""" """
task = MagicMock(Task) task = MagicMock(Task)
task.async = 0 task.async = 0
task.async_val = False
task.args = { task.args = {
'key': 'test-update', 'key': 'test-update',
'value': 'test-value', 'value': 'test-value',
@ -425,6 +434,7 @@ class TestRecord(TestAra):
""" """
task = MagicMock(Task) task = MagicMock(Task)
task.async = 0 task.async = 0
task.async_val = False
task.args = { task.args = {
'value': 'test-value' 'value': 'test-value'
} }
@ -449,6 +459,7 @@ class TestRecord(TestAra):
""" """
task = MagicMock(Task) task = MagicMock(Task)
task.async = 0 task.async = 0
task.async_val = False
task.args = { task.args = {
'key': 'test-key', 'key': 'test-key',
} }

20
zuul.d/jobs.yaml
View File

@ -6,35 +6,35 @@
timeout: 900 timeout: 900
- job: - job:
name: ara-integration-debian-py27-2.2.3.0 name: ara-integration-debian-py27-2.4.3.0
parent: ara-integration-base parent: ara-integration-base
vars: vars:
python_test_version: py27 python_test_version: py27
ansible_test_version: 2.2.3.0 ansible_test_version: 2.4.3.0
nodeset: debian-jessie nodeset: debian-jessie
- job: - job:
name: ara-integration-centos-py27-2.3.2.0 name: ara-integration-centos-py27-2.4.3.0
parent: ara-integration-base parent: ara-integration-base
vars: vars:
python_test_version: py27 python_test_version: py27
ansible_test_version: 2.3.2.0 ansible_test_version: 2.4.3.0
nodeset: centos-7 nodeset: centos-7
- job: - job:
name: ara-integration-opensuse-py27-latest name: ara-integration-opensuse-py27-2.5.0
parent: ara-integration-base parent: ara-integration-base
vars: vars:
python_test_version: py27 python_test_version: py27
ansible_test_version: latest ansible_test_version: 2.5.0
nodeset: opensuse-423 nodeset: opensuse-423
- job: - job:
name: ara-integration-ubuntu-py35-2.3.2.0 name: ara-integration-ubuntu-py35-2.5.0
parent: ara-integration-base parent: ara-integration-base
vars: vars:
python_test_version: py35 python_test_version: py35
ansible_test_version: 2.3.2.0 ansible_test_version: 2.5.0
nodeset: ubuntu-xenial nodeset: ubuntu-xenial
- job: - job:
@ -46,11 +46,11 @@
nodeset: ubuntu-xenial nodeset: ubuntu-xenial
- job: - job:
name: ara-integration-fedora-py35-latest name: ara-integration-fedora-py35-2.5.0
parent: ara-integration-base parent: ara-integration-base
vars: vars:
python_test_version: py35 python_test_version: py35
ansible_test_version: latest ansible_test_version: 2.5.0
nodeset: fedora-27 nodeset: fedora-27
- job: - job:

20
zuul.d/layout.yaml
View File

@ -1,19 +1,19 @@
- project: - project:
check: check:
jobs: jobs:
- ara-integration-debian-py27-2.2.3.0 - ara-integration-debian-py27-2.4.3.0
- ara-integration-centos-py27-2.3.2.0 - ara-integration-centos-py27-2.4.3.0
- ara-integration-opensuse-py27-latest: - ara-integration-opensuse-py27-2.5.0
voting: false - ara-integration-ubuntu-py35-2.5.0
- ara-integration-ubuntu-py35-2.3.2.0
- ara-integration-ubuntu-py35-devel: - ara-integration-ubuntu-py35-devel:
voting: false voting: false
- ara-integration-fedora-py35-latest - ara-integration-fedora-py35-2.5.0
- ara-integration-fedora-py35-devel: - ara-integration-fedora-py35-devel:
voting: false voting: false
gate: gate:
jobs: jobs:
- ara-integration-debian-py27-2.2.3.0 - ara-integration-debian-py27-2.4.3.0
- ara-integration-centos-py27-2.3.2.0 - ara-integration-centos-py27-2.4.3.0
- ara-integration-ubuntu-py35-2.3.2.0 - ara-integration-opensuse-py27-2.5.0
- ara-integration-fedora-py35-latest - ara-integration-ubuntu-py35-2.5.0
- ara-integration-fedora-py35-2.5.0