From b030fb097e487defba9a4422185e7676f9357551 Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Wed, 4 Apr 2018 18:46:42 -0400 Subject: [PATCH] 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 --- README.rst | 8 +++----- ara/tests/unit/test_ara_read.py | 5 +++++ ara/tests/unit/test_ara_record.py | 11 +++++++++++ zuul.d/jobs.yaml | 20 ++++++++++---------- zuul.d/layout.yaml | 20 ++++++++++---------- 5 files changed, 39 insertions(+), 25 deletions(-) diff --git a/README.rst b/README.rst index 89303465..0238343b 100644 --- a/README.rst +++ b/README.rst @@ -112,13 +112,11 @@ regressions. Here's our current testing coverage: +------------------+--------+--------+----------+--------+--------+ | - | 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 diff --git a/ara/tests/unit/test_ara_read.py b/ara/tests/unit/test_ara_read.py index 7ec2917f..2fe6f3df 100644 --- a/ara/tests/unit/test_ara_read.py +++ b/ara/tests/unit/test_ara_read.py @@ -121,6 +121,7 @@ class TestRead(TestAra): self.task = MagicMock(Task) self.task.async = 0 + self.task.async_val = False self.task.args = { 'key': 'test-key', 'value': 'test-value', @@ -162,6 +163,7 @@ class TestRead(TestAra): def _test_task(self, playbook): name = 'test-task-%s' % self.tag task = Task(name, playbook.path) + task.async_val = False self.cb.v2_playbook_on_task_start(task, False) return task @@ -174,6 +176,7 @@ class TestRead(TestAra): task = MagicMock(Task) task.async = 0 + task.async_val = False task.args = { 'playbook': r_playbook.id, 'key': 'test-key', @@ -203,6 +206,7 @@ class TestRead(TestAra): """ task = MagicMock(Task) task.async = 0 + task.async_val = False task.args = { 'key': 'test-key', } @@ -234,6 +238,7 @@ class TestRead(TestAra): """ task = MagicMock(Task) task.async = 0 + task.async_val = False task.args = { 'key': 'key', } diff --git a/ara/tests/unit/test_ara_record.py b/ara/tests/unit/test_ara_record.py index 1184bfa8..90c47d79 100644 --- a/ara/tests/unit/test_ara_record.py +++ b/ara/tests/unit/test_ara_record.py @@ -159,6 +159,7 @@ class TestRecord(TestAra): task = MagicMock(Task) task.async = 0 + task.async_val = False task.args = { 'playbook': r_playbook.id, 'key': 'test-text', @@ -185,6 +186,7 @@ class TestRecord(TestAra): """ task = MagicMock(Task) task.async = 0 + task.async_val = False task.args = { 'key': 'test-text', 'value': 'test-value', @@ -213,6 +215,7 @@ class TestRecord(TestAra): """ task = MagicMock(Task) task.async = 0 + task.async_val = False task.args = { 'key': 'test-url', 'value': 'http://url', @@ -241,6 +244,7 @@ class TestRecord(TestAra): """ task = MagicMock(Task) task.async = 0 + task.async_val = False task.args = { 'key': 'test-json', 'value': '{"foo": "bar"}', @@ -269,6 +273,7 @@ class TestRecord(TestAra): """ task = MagicMock(Task) task.async = 0 + task.async_val = False task.args = { 'key': 'test-list', 'value': ['foo', 'bar'], @@ -297,6 +302,7 @@ class TestRecord(TestAra): """ task = MagicMock(Task) task.async = 0 + task.async_val = False task.args = { 'key': 'test-dict', 'value': {'foo': 'bar'}, @@ -325,6 +331,7 @@ class TestRecord(TestAra): """ task = MagicMock(Task) task.async = 0 + task.async_val = False task.args = { 'key': 'test-notype', 'value': 'test-value' @@ -352,6 +359,7 @@ class TestRecord(TestAra): """ task = MagicMock(Task) task.async = 0 + task.async_val = False task.args = { 'key': 'test-wrongtype', 'value': ['foo', 'bar'], @@ -381,6 +389,7 @@ class TestRecord(TestAra): """ task = MagicMock(Task) task.async = 0 + task.async_val = False task.args = { 'key': 'test-update', 'value': 'test-value', @@ -425,6 +434,7 @@ class TestRecord(TestAra): """ task = MagicMock(Task) task.async = 0 + task.async_val = False task.args = { 'value': 'test-value' } @@ -449,6 +459,7 @@ class TestRecord(TestAra): """ task = MagicMock(Task) task.async = 0 + task.async_val = False task.args = { 'key': 'test-key', } diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index d0095099..c903447b 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -6,35 +6,35 @@ timeout: 900 - job: - name: ara-integration-debian-py27-2.2.3.0 + name: ara-integration-debian-py27-2.4.3.0 parent: ara-integration-base vars: python_test_version: py27 - ansible_test_version: 2.2.3.0 + ansible_test_version: 2.4.3.0 nodeset: debian-jessie - job: - name: ara-integration-centos-py27-2.3.2.0 + name: ara-integration-centos-py27-2.4.3.0 parent: ara-integration-base vars: python_test_version: py27 - ansible_test_version: 2.3.2.0 + ansible_test_version: 2.4.3.0 nodeset: centos-7 - job: - name: ara-integration-opensuse-py27-latest + name: ara-integration-opensuse-py27-2.5.0 parent: ara-integration-base vars: python_test_version: py27 - ansible_test_version: latest + ansible_test_version: 2.5.0 nodeset: opensuse-423 - job: - name: ara-integration-ubuntu-py35-2.3.2.0 + name: ara-integration-ubuntu-py35-2.5.0 parent: ara-integration-base vars: python_test_version: py35 - ansible_test_version: 2.3.2.0 + ansible_test_version: 2.5.0 nodeset: ubuntu-xenial - job: @@ -46,11 +46,11 @@ nodeset: ubuntu-xenial - job: - name: ara-integration-fedora-py35-latest + name: ara-integration-fedora-py35-2.5.0 parent: ara-integration-base vars: python_test_version: py35 - ansible_test_version: latest + ansible_test_version: 2.5.0 nodeset: fedora-27 - job: diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 60e5c077..85b65cc8 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -1,19 +1,19 @@ - project: check: jobs: - - ara-integration-debian-py27-2.2.3.0 - - ara-integration-centos-py27-2.3.2.0 - - ara-integration-opensuse-py27-latest: - voting: false - - ara-integration-ubuntu-py35-2.3.2.0 + - ara-integration-debian-py27-2.4.3.0 + - ara-integration-centos-py27-2.4.3.0 + - ara-integration-opensuse-py27-2.5.0 + - ara-integration-ubuntu-py35-2.5.0 - ara-integration-ubuntu-py35-devel: voting: false - - ara-integration-fedora-py35-latest + - ara-integration-fedora-py35-2.5.0 - ara-integration-fedora-py35-devel: voting: false gate: jobs: - - ara-integration-debian-py27-2.2.3.0 - - ara-integration-centos-py27-2.3.2.0 - - ara-integration-ubuntu-py35-2.3.2.0 - - ara-integration-fedora-py35-latest + - ara-integration-debian-py27-2.4.3.0 + - ara-integration-centos-py27-2.4.3.0 + - ara-integration-opensuse-py27-2.5.0 + - ara-integration-ubuntu-py35-2.5.0 + - ara-integration-fedora-py35-2.5.0