diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-07-26 14:37:52 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-26 14:37:52 -0400 |
commit | f91b0fc1aca24e551b80d0e81f098fc35793bb16 (patch) | |
tree | 12f8df434756e561c6627142f381c4c348de3607 /roles/openshift_health_checker/test/ovs_version_test.py | |
parent | cff5116a1dae3c6b44afa59ae5fd08b398873945 (diff) | |
parent | 210fc2d3849a1baf9c1d8535044d92df23424274 (diff) | |
download | openshift-f91b0fc1aca24e551b80d0e81f098fc35793bb16.tar.gz openshift-f91b0fc1aca24e551b80d0e81f098fc35793bb16.tar.bz2 openshift-f91b0fc1aca24e551b80d0e81f098fc35793bb16.tar.xz openshift-f91b0fc1aca24e551b80d0e81f098fc35793bb16.zip |
Merge pull request #4485 from sosiouxme/20170616-store-args-in-check-properties
openshift_checks: store args in check properties
Diffstat (limited to 'roles/openshift_health_checker/test/ovs_version_test.py')
-rw-r--r-- | roles/openshift_health_checker/test/ovs_version_test.py | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/roles/openshift_health_checker/test/ovs_version_test.py b/roles/openshift_health_checker/test/ovs_version_test.py index 6494e1c06..b6acef5a6 100644 --- a/roles/openshift_health_checker/test/ovs_version_test.py +++ b/roles/openshift_health_checker/test/ovs_version_test.py @@ -4,7 +4,7 @@ from openshift_checks.ovs_version import OvsVersion, OpenShiftCheckException def test_openshift_version_not_supported(): - def execute_module(module_name=None, module_args=None, tmp=None, task_vars=None): + def execute_module(*_): return {} openshift_release = '111.7.0' @@ -16,15 +16,14 @@ def test_openshift_version_not_supported(): openshift_deployment_type='origin', ) - check = OvsVersion(execute_module=execute_module) with pytest.raises(OpenShiftCheckException) as excinfo: - check.run(tmp=None, task_vars=task_vars) + OvsVersion(execute_module, task_vars).run() assert "no recommended version of Open vSwitch" in str(excinfo.value) def test_invalid_openshift_release_format(): - def execute_module(module_name=None, module_args=None, tmp=None, task_vars=None): + def execute_module(*_): return {} task_vars = dict( @@ -33,9 +32,8 @@ def test_invalid_openshift_release_format(): openshift_deployment_type='origin', ) - check = OvsVersion(execute_module=execute_module) with pytest.raises(OpenShiftCheckException) as excinfo: - check.run(tmp=None, task_vars=task_vars) + OvsVersion(execute_module, task_vars).run() assert "invalid version" in str(excinfo.value) @@ -54,7 +52,7 @@ def test_ovs_package_version(openshift_release, expected_ovs_version): ) return_value = object() - def execute_module(module_name=None, module_args=None, tmp=None, task_vars=None): + def execute_module(module_name=None, module_args=None, *_): assert module_name == 'rpm_version' assert "package_list" in module_args @@ -64,8 +62,7 @@ def test_ovs_package_version(openshift_release, expected_ovs_version): return return_value - check = OvsVersion(execute_module=execute_module) - result = check.run(tmp=None, task_vars=task_vars) + result = OvsVersion(execute_module, task_vars).run() assert result is return_value @@ -86,4 +83,4 @@ def test_ovs_version_skip_when_not_master_nor_node(group_names, is_containerized group_names=group_names, openshift=dict(common=dict(is_containerized=is_containerized)), ) - assert OvsVersion.is_active(task_vars=task_vars) == is_active + assert OvsVersion(None, task_vars).is_active() == is_active |