dont expect a service without name

Author: gaelgatelement

tests/integration/lib/helpers.py

@@ -110,45 +110,58 @@ async def get_deployment_marker(kube_client, generated_data, marker: str):
 
 async def run_pod_with_args(kube_client: AsyncClient, namespace, image_name, pod_name, args):
     pod = Pod(
-        metadata=ObjectMeta(name=pod_name + "-" + str(int(time.time()*1000)), namespace=namespace),
-        spec=PodSpec(restartPolicy="Never",
-                      containers=[Container(name="cmd", image=image_name, args=args,
-                                    securityContext=SecurityContext(
-                                    seccompProfile=SeccompProfile(type="RuntimeDefault"),
-                                    capabilities=Capabilities(drop=["ALL"]),
-                                    readOnlyRootFilesystem=True,
-                                    allowPrivilegeEscalation=False,
-                                    runAsNonRoot=True,
-                                    runAsUser=3000,
-                                    runAsGroup=3000,
-                                    ),
-                                )
-                            ])
-            )
+        metadata=ObjectMeta(name=pod_name + "-" + str(int(time.time() * 1000)), namespace=namespace),
+        spec=PodSpec(
+            restartPolicy="Never",
+            containers=[
+                Container(
+                    name="cmd",
+                    image=image_name,
+                    args=args,
+                    securityContext=SecurityContext(
+                        seccompProfile=SeccompProfile(type="RuntimeDefault"),
+                        capabilities=Capabilities(drop=["ALL"]),
+                        readOnlyRootFilesystem=True,
+                        allowPrivilegeEscalation=False,
+                        runAsNonRoot=True,
+                        runAsUser=3000,
+                        runAsGroup=3000,
+                    ),
+                )
+            ],
+        ),
+    )
+    assert pod.metadata
+    assert pod.metadata.name
+    assert pod.metadata.namespace
     try:
         await kube_client.create(pod)
         start_time = time.time()
         now = time.time()
         completed = False
         while start_time + 30 > now and not completed:
             found_pod = await kube_client.get(Pod, name=pod.metadata.name, namespace=pod.metadata.namespace)
-            if (found_pod.status.containerStatuses
+            if (
+                found_pod.status
+                and found_pod.status.containerStatuses
                 and found_pod.status.containerStatuses[0].lastState
                 and found_pod.status.containerStatuses[0].lastState.terminated
-                and found_pod.status.containerStatuses[0].lastState.terminated.reason == "Completed"):
+                and found_pod.status.containerStatuses[0].lastState.terminated.reason == "Completed"
+            ):
                 completed = True
             else:
                 now = time.time()
                 await asyncio.sleep(1)
         else:
             if start_time + 30 > now:
-                raise RuntimeError(f"Pod {pod.metadata.name} did not start in time "
-                               f"(failed after {time.time() - now} seconds), "
-                               f"pod status: {found_pod.status}")
+                raise RuntimeError(
+                    f"Pod {pod.metadata.name} did not start in time "
+                    f"(failed after {time.time() - now} seconds), "
+                    f"pod status: {found_pod.status}"
+                )
 
         log_lines = ""
-        async for log_line in kube_client.log(pod.metadata.name, namespace=pod.metadata.namespace, 
-                                              container="cmd"):
+        async for log_line in kube_client.log(pod.metadata.name, namespace=pod.metadata.namespace, container="cmd"):
             log_lines += log_line
         return log_lines
     finally:

tests/integration/test_networking.py

@@ -140,9 +140,6 @@ async def test_pods_monitored(
                 service_port_names = [port.name for port in service.spec.ports if port.name]
                 if endpoint["port"] in service_port_names:
                     break
-            # This Service does not have the named port. Potentially there's another Service that covers it
-            else:
-                continue
 
             async for covered_pod in kube_client.list(
                 Pod, namespace=generated_data.ess_namespace, labels=service.spec.selector
@@ -165,7 +162,6 @@ async def test_pods_monitored(
     )
 
 
-
 @pytest.mark.skipif(
     os.environ.get("SKIP_SERVICE_MONITORS_CRDS", "false") == "true", reason="ServiceMonitors not deployed"
 )
@@ -203,7 +199,7 @@ async def test_service_monitors_point_to_metrics(
 async def has_actual_metrics_on_endpoint(
     kube_client: AsyncClient, generated_data: ESSData, service: Service, endpoints
 ):
-    assert service.metadataco
+    assert service.metadata
     assert service.spec
     assert service.spec.ports
     found_metrics = False
@@ -215,7 +211,10 @@ async def has_actual_metrics_on_endpoint(
                     generated_data.ess_namespace,
                     "curlimages/curl:latest",
                     "curl",
-                    ["-s", f"http://{service.metadata.name}.{generated_data.ess_namespace}.svc.cluster.local:{port_spec.port}/metrics"],
+                    [
+                        "-s",
+                        f"http://{service.metadata.name}.{generated_data.ess_namespace}.svc.cluster.local:{port_spec.port}/metrics",
+                    ],
                 )
                 for metric_family in text_string_to_metric_families(metrics_data):
                     assert metric_family.name, "Metric family has no name"