From 1cc8d8c64a4f7e36205dc967e3457dc70ff5fb35 Mon Sep 17 00:00:00 2001 From: Itzik Brown Date: Wed, 3 Oct 2018 17:44:07 +0300 Subject: [PATCH] Limit the scope of try-except block The scope of the try-except block in get_readiness_state is too big. Change-Id: Ie9e3acbb349550d91b795316d6d2c83a3803004e --- kuryr_tempest_plugin/tests/scenario/base.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/kuryr_tempest_plugin/tests/scenario/base.py b/kuryr_tempest_plugin/tests/scenario/base.py index c37d5c52..a3ee79be 100644 --- a/kuryr_tempest_plugin/tests/scenario/base.py +++ b/kuryr_tempest_plugin/tests/scenario/base.py @@ -173,17 +173,18 @@ class BaseKuryrScenarioTest(manager.NetworkScenarioTest): try: pod = cls.k8s_client.CoreV1Api().read_namespaced_pod(pod_name, namespace) - if container_name: - for container in pod.status.container_statuses: - if container.name == container_name: - return container.ready - else: - for condition in pod.status.conditions: - if condition.type == 'Ready': - return condition.status except kubernetes.client.rest.ApiException: return None + if container_name: + for container in pod.status.container_statuses: + if container.name == container_name: + return container.ready + else: + for condition in pod.status.conditions: + if condition.type == 'Ready': + return condition.status + @classmethod def get_pod_readiness(cls, pod_name, namespace="default"): return cls.get_readiness_state(pod_name, namespace=namespace)