diff options
| author | Miciah Masters <miciah.masters@gmail.com> | 2017-08-08 16:49:51 -0400 |
|---|---|---|
| committer | Miciah Dashiel Butler Masters <mmasters@redhat.com> | 2017-08-11 09:50:31 -0400 |
| commit | 7df38035f5e20d49d6cd5eb7a3310070a63a2f78 (patch) | |
| tree | c4557e6a4faac6719e48f42021879acda92ebd00 /roles/openshift_health_checker/test | |
| parent | 566731dc4dd1aebbbf0244dc8a31eefb8cd42de5 (diff) | |
| download | openshift-7df38035f5e20d49d6cd5eb7a3310070a63a2f78.tar.gz openshift-7df38035f5e20d49d6cd5eb7a3310070a63a2f78.tar.bz2 openshift-7df38035f5e20d49d6cd5eb7a3310070a63a2f78.tar.xz openshift-7df38035f5e20d49d6cd5eb7a3310070a63a2f78.zip | |
openshift_checks: allow OVS 2.7 on OCP 3.5 and 3.6
rpm_version: Allow package_list items to specify a list value for version.
If a list value is provided for a package, pass the check if any version in
that list is found.
ovs_version: Specify both 2.6 and 2.7 as allowed versions of OVS for
OpenShift versions 3.5 and 3.6.
Diffstat (limited to 'roles/openshift_health_checker/test')
| -rw-r--r-- | roles/openshift_health_checker/test/ovs_version_test.py | 4 | ||||
| -rw-r--r-- | roles/openshift_health_checker/test/rpm_version_test.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_health_checker/test/ovs_version_test.py b/roles/openshift_health_checker/test/ovs_version_test.py index b6acef5a6..e1bf29d2a 100644 --- a/roles/openshift_health_checker/test/ovs_version_test.py +++ b/roles/openshift_health_checker/test/ovs_version_test.py @@ -38,8 +38,8 @@ def test_invalid_openshift_release_format(): @pytest.mark.parametrize('openshift_release,expected_ovs_version', [ - ("3.5", "2.6"), - ("3.6", "2.6"), + ("3.5", ["2.6", "2.7"]), + ("3.6", ["2.6", "2.7"]), ("3.4", "2.4"), ("3.3", "2.4"), ("1.0", "2.4"), diff --git a/roles/openshift_health_checker/test/rpm_version_test.py b/roles/openshift_health_checker/test/rpm_version_test.py index 2f09ef965..2c1bcf876 100644 --- a/roles/openshift_health_checker/test/rpm_version_test.py +++ b/roles/openshift_health_checker/test/rpm_version_test.py @@ -49,7 +49,7 @@ def test_check_pkg_found(pkgs, expect_not_found): }, { "eggs": { - "required_version": "3.2", + "required_versions": ["3.2"], "found_versions": ["3.3"], } }, # not the right version @@ -61,11 +61,11 @@ def test_check_pkg_found(pkgs, expect_not_found): }, { "eggs": { - "required_version": "3.2", + "required_versions": ["3.2"], "found_versions": ["3.3", "1.2"], }, "spam": { - "required_version": "3.2", + "required_versions": ["3.2"], "found_versions": ["3.1", "3.3"], } }, # not the right version |