diff options
author | Rodolfo Carvalho <rhcarvalho@gmail.com> | 2017-07-18 11:14:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-18 11:14:36 +0200 |
commit | a41fc449c3e56646365701e5b7a40b29eb9e3b67 (patch) | |
tree | 58cdec0bc3d83acea6023aa5c6e3f0721c5d0cd2 /roles/openshift_health_checker/test/package_version_test.py | |
parent | 5a6bf7ddd2f7ef11416a3552d058bbec071d9308 (diff) | |
parent | a6dbc9ff06b6a245317de6279e7b3c88ff0ef1c3 (diff) | |
download | openshift-a41fc449c3e56646365701e5b7a40b29eb9e3b67.tar.gz openshift-a41fc449c3e56646365701e5b7a40b29eb9e3b67.tar.bz2 openshift-a41fc449c3e56646365701e5b7a40b29eb9e3b67.tar.xz openshift-a41fc449c3e56646365701e5b7a40b29eb9e3b67.zip |
Merge pull request #4758 from rhcarvalho/bz1465882-package_version-ovs2.7-on-ocp3.6
Allow Open vSwitch 2.7 on OpenShift 3.5 and 3.6
Diffstat (limited to 'roles/openshift_health_checker/test/package_version_test.py')
-rw-r--r-- | roles/openshift_health_checker/test/package_version_test.py | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/roles/openshift_health_checker/test/package_version_test.py b/roles/openshift_health_checker/test/package_version_test.py index 91eace512..1bb6371ae 100644 --- a/roles/openshift_health_checker/test/package_version_test.py +++ b/roles/openshift_health_checker/test/package_version_test.py @@ -72,36 +72,6 @@ def test_package_version(openshift_release): assert result is return_value -@pytest.mark.parametrize('deployment_type,openshift_release,expected_ovs_version', [ - ("openshift-enterprise", "3.5", "2.6"), - ("origin", "3.6", "2.6"), - ("openshift-enterprise", "3.4", "2.4"), - ("origin", "3.3", "2.4"), -]) -def test_ovs_package_version(deployment_type, openshift_release, expected_ovs_version): - task_vars = dict( - openshift=dict(common=dict(service_type='origin')), - openshift_release=openshift_release, - openshift_image_tag='v' + openshift_release, - openshift_deployment_type=deployment_type, - ) - return_value = object() - - def execute_module(module_name=None, module_args=None, tmp=None, task_vars=None): - assert module_name == 'aos_version' - assert "package_list" in module_args - - for pkg in module_args["package_list"]: - if pkg["name"] == "openvswitch": - assert pkg["version"] == expected_ovs_version - - return return_value - - check = PackageVersion(execute_module=execute_module) - result = check.run(tmp=None, task_vars=task_vars) - assert result is return_value - - @pytest.mark.parametrize('deployment_type,openshift_release,expected_docker_version', [ ("origin", "3.5", "1.12"), ("openshift-enterprise", "3.4", "1.12"), |