From a202f1647a28e4d246d0341e37501df44cb1a914 Mon Sep 17 00:00:00 2001 From: Luke Meyer Date: Wed, 23 Aug 2017 17:44:19 -0400 Subject: openshift_checks: add retries in python --- .../test/docker_image_availability_test.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'roles/openshift_health_checker/test/docker_image_availability_test.py') diff --git a/roles/openshift_health_checker/test/docker_image_availability_test.py b/roles/openshift_health_checker/test/docker_image_availability_test.py index 8d0a53df9..b51fdeac4 100644 --- a/roles/openshift_health_checker/test/docker_image_availability_test.py +++ b/roles/openshift_health_checker/test/docker_image_availability_test.py @@ -69,7 +69,7 @@ def test_all_images_available_remotely(available_locally): return {'images': [], 'failed': available_locally} return {'changed': False} - result = DockerImageAvailability(execute_module, task_vars=dict( + check = DockerImageAvailability(execute_module, task_vars=dict( openshift=dict( common=dict( service_type='origin', @@ -81,7 +81,9 @@ def test_all_images_available_remotely(available_locally): openshift_deployment_type='origin', openshift_image_tag='v3.4', group_names=['nodes', 'masters'], - )).run() + )) + check._module_retry_interval = 0 + result = check.run() assert not result.get('failed', False) @@ -97,7 +99,7 @@ def test_all_images_unavailable(): 'changed': False, } - actual = DockerImageAvailability(execute_module, task_vars=dict( + check = DockerImageAvailability(execute_module, task_vars=dict( openshift=dict( common=dict( service_type='origin', @@ -109,7 +111,9 @@ def test_all_images_unavailable(): openshift_deployment_type="openshift-enterprise", openshift_image_tag='latest', group_names=['nodes', 'masters'], - )).run() + )) + check._module_retry_interval = 0 + actual = check.run() assert actual['failed'] assert "required Docker images are not available" in actual['msg'] @@ -136,7 +140,7 @@ def test_skopeo_update_failure(message, extra_words): return {'changed': False} - actual = DockerImageAvailability(execute_module, task_vars=dict( + check = DockerImageAvailability(execute_module, task_vars=dict( openshift=dict( common=dict( service_type='origin', @@ -148,7 +152,9 @@ def test_skopeo_update_failure(message, extra_words): openshift_deployment_type="openshift-enterprise", openshift_image_tag='', group_names=['nodes', 'masters'], - )).run() + )) + check._module_retry_interval = 0 + actual = check.run() assert actual["failed"] for word in extra_words: -- cgit v1.2.1