From e5b2b7249714d6357394fcc905d28eec4b289cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Goinvic?= Date: Wed, 2 Jul 2025 08:24:12 +0200 Subject: [PATCH 1/2] ci: dont check services matching terminating pods --- newsfragments/595.internal.md | 1 + tests/integration/test_networking.py | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 newsfragments/595.internal.md diff --git a/newsfragments/595.internal.md b/newsfragments/595.internal.md new file mode 100644 index 00000000..528e276d --- /dev/null +++ b/newsfragments/595.internal.md @@ -0,0 +1 @@ +Tests : Dont check services matching labels against terminating pods. diff --git a/tests/integration/test_networking.py b/tests/integration/test_networking.py index ba4b7d4e..ba8b68fa 100644 --- a/tests/integration/test_networking.py +++ b/tests/integration/test_networking.py @@ -40,6 +40,8 @@ async def test_services_have_matching_labels( label_selectors = {label: value for label, value in service.spec.selector.items()} async for pod in kube_client.list(Pod, namespace=generated_data.ess_namespace, labels=label_selectors): + if pod.status and pod.status.phase == "Terminating": + continue # Skip terminating pods assert service.metadata, f"Encountered a service without metadata : {service}" assert pod.metadata, f"Encountered a pod without metadata : {pod}" assert pod.metadata.labels, f"Encountered a pod without labels : {pod}" From 5748fae385e128bbfb14da54e0f44c3bf1270037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Goinvic?= Date: Wed, 2 Jul 2025 09:33:49 +0200 Subject: [PATCH 2/2] add more logs in assert message --- tests/integration/test_networking.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/integration/test_networking.py b/tests/integration/test_networking.py index ba8b68fa..2e501bbc 100644 --- a/tests/integration/test_networking.py +++ b/tests/integration/test_networking.py @@ -57,6 +57,9 @@ async def test_services_have_matching_labels( assert label.replace("k8s.element.io/target-", "app.kubernetes.io/") in pod.metadata.labels assert value.startswith( pod.metadata.labels[label.replace("k8s.element.io/target-", "app.kubernetes.io/")] + ), ( + f"{pod.metadata.name} does not have the correct label {label}={value} " + f"(pod status phase : {pod.status.phase if pod.status else 'N/A'}" )