Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/pygeoapi_k8s_manager/finalizer.py
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please move your new if out of the existing one. I think, having it before line 168 is better.

What do you think?

Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@ def handle_job_ended_event(
)
LOGGER.debug(f"Found '{len(pods.items)}' pod{'s' if len(pods.items) > 1 else ''} for job '{job.metadata.name}'")
if len(pods.items) < 1:
if job.metadata.deletion_timestamp:
LOGGER.debug(f"Job '{job.metadata.name}' is being deleted. No pods found.")
return
LOGGER.error(f"Could not get pod for job '{job.metadata.name}'")
return
pod = pods.items[0]
Expand Down
35 changes: 35 additions & 0 deletions tests/test_finalizer_deleted_job.py
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems to me, that your test should be located in the test_finalizer.py.
This might highlight the case, that your test is not doing anything different from the already existing test test_handle_job_ended_event_does_not_fail_if_no_pod_found_for_job. So, please elaborate, why this test is required and how your new behaviour is tested with it.

Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@

import datetime
from unittest.mock import MagicMock, patch

import pytest
from kubernetes.client import V1PodList

from pygeoapi_k8s_manager.finalizer import KubernetesFinalizerController

@pytest.fixture()
def finalizer():
return KubernetesFinalizerController("")

def test_handle_job_ended_event_handles_deleted_job(finalizer):
finalizer.is_upload_logs_to_s3 = False
k8s_core_api = MagicMock()
k8s_core_api.list_namespaced_pod.return_value = V1PodList(items=[])

test_job = MagicMock()
test_job.metadata.name = "test-job"
test_job.metadata.deletion_timestamp = datetime.datetime.now()

with (
patch(
"pygeoapi_k8s_manager.finalizer.KubernetesFinalizerController.upload_logs_to_s3"
) as mocked_upload_logs_to_s3,
patch("pygeoapi_k8s_manager.util.get_logs_for_pod") as mocked_get_logs_for_pod,
):
finalizer.handle_job_ended_event(
k8s_core_api=k8s_core_api,
job=test_job,
)

mocked_get_logs_for_pod.assert_not_called()
mocked_upload_logs_to_s3.assert_not_called()