Skip to content

Commit 4f602d0

Browse files
service/pods labels matching tests: also skip succeeded
1 parent 4d8171f commit 4f602d0

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

newsfragments/598.internal.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Tests : Dont check services matching labels against terminating pods.

tests/integration/test_networking.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ async def test_services_have_matching_labels(
4040
label_selectors = {label: value for label, value in service.spec.selector.items()}
4141

4242
async for pod in kube_client.list(Pod, namespace=generated_data.ess_namespace, labels=label_selectors):
43-
if pod.status and pod.status.phase == "Terminating":
43+
if pod.status and pod.status.phase not in ("Terminating", "Succeeded"):
4444
continue # Skip terminating pods
4545
assert service.metadata, f"Encountered a service without metadata : {service}"
4646
assert pod.metadata, f"Encountered a pod without metadata : {pod}"
@@ -58,7 +58,8 @@ async def test_services_have_matching_labels(
5858
assert value.startswith(
5959
pod.metadata.labels[label.replace("k8s.element.io/target-", "app.kubernetes.io/")]
6060
), (
61-
f"{pod.metadata.name} does not have the correct label {label}={value} "
61+
f"{value} does not starts with "
62+
f"{pod.metadata.labels[label.replace('k8s.element.io/target-', 'app.kubernetes.io/')]}"
6263
f"(pod status phase : {pod.status.phase if pod.status else 'N/A'}"
6364
)
6465

0 commit comments

Comments
 (0)