From 872cc512ddc4e6e7dffae05118fc7aeccab122c1 Mon Sep 17 00:00:00 2001 From: Zac Pitones Date: Fri, 24 May 2024 00:35:01 -0500 Subject: [PATCH] fix typo in Job condition check Signed-off-by: Zac Pitones --- oper8/verify_resources.py | 3 ++- tests/test_verify_resources.py | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/oper8/verify_resources.py b/oper8/verify_resources.py index f50ac2f..5f361e7 100644 --- a/oper8/verify_resources.py +++ b/oper8/verify_resources.py @@ -24,6 +24,7 @@ DEFAULT_TIMESTAMP_KEY = "lastTransitionTime" AVAILABLE_CONDITION_KEY = "Available" +COMPLETE_CONDITION_KEY = "Complete" PROGRESSING_CONDITION_KEY = "Progressing" NEW_RS_AVAILABLE_REASON = "NewReplicaSetAvailable" @@ -144,7 +145,7 @@ def verify_pod(object_state: dict) -> bool: def verify_job(object_state: dict) -> bool: """Verify that a job has completed successfully""" # https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/job-v1/#JobStatus - return _verify_condition(object_state, "Completed", True) + return _verify_condition(object_state, COMPLETE_CONDITION_KEY, True) def verify_deployment(object_state: dict) -> bool: diff --git a/tests/test_verify_resources.py b/tests/test_verify_resources.py index 8249b00..92d422d 100644 --- a/tests/test_verify_resources.py +++ b/tests/test_verify_resources.py @@ -20,6 +20,7 @@ from oper8.utils import nested_set from oper8.verify_resources import ( AVAILABLE_CONDITION_KEY, + COMPLETE_CONDITION_KEY, DEFAULT_TIMESTAMP_KEY, NEW_RS_AVAILABLE_REASON, PROGRESSING_CONDITION_KEY, @@ -182,7 +183,9 @@ def test_verify_pod_custom_verification(): def test_verify_job_completed(): """Make sure a completed job verifies cleanly""" - assert run_test_verify(kind="Job", conditions=[make_condition("Completed", True)]) + assert run_test_verify( + kind="Job", conditions=[make_condition(COMPLETE_CONDITION_KEY, True)] + ) def test_verify_job_failed(): @@ -216,7 +219,7 @@ def test_verify_job_separate_namespace(): """Make sure a completed job from a different namespace verifies cleanly""" assert run_test_verify( kind="Job", - conditions=[make_condition("Completed", True)], + conditions=[make_condition(COMPLETE_CONDITION_KEY, True)], obj_namespace="adifferent", search_namespace="adifferent", ) @@ -226,7 +229,7 @@ def test_verify_job_null_namespace(): """Make sure a completed job in the same namespace verifies cleanly""" assert run_test_verify( kind="Job", - conditions=[make_condition("Completed", True)], + conditions=[make_condition(COMPLETE_CONDITION_KEY, True)], obj_namespace=TEST_NAMESPACE, search_namespace=_SESSION_NAMESPACE, )