From 7612ac36c4d2a773c96a2a03ec3677d45a9850cb Mon Sep 17 00:00:00 2001 From: wind57 Date: Wed, 2 Apr 2025 12:15:36 +0300 Subject: [PATCH] fix test Signed-off-by: wind57 --- .../integration/tests/commons/fabric8_client/Util.java | 8 +++++--- .../integration/tests/commons/native_client/Util.java | 9 ++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java index 7f4ef19a..e0156007 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java @@ -132,7 +132,7 @@ public final class Util { } } - public void deleteAndWait(String namespace, @Nullable Deployment deployment, Service service) { + public void deleteAndWait(String namespace, @Nullable Deployment deployment, @Nullable Service service) { try { long startTime = System.currentTimeMillis(); @@ -150,8 +150,10 @@ public final class Util { } System.out.println("Ended deployment delete in " + (System.currentTimeMillis() - startTime) + "ms"); - client.services().inNamespace(namespace).resource(service).delete(); - waitForServiceToBeDeleted(namespace, service); + if (service != null) { + client.services().inNamespace(namespace).resource(service).delete(); + waitForServiceToBeDeleted(namespace, service); + } } catch (Exception e) { diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java index 1f385d37..b9e813a8 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java @@ -209,10 +209,13 @@ public final class Util { waitForDeploymentToBeDeleted(deploymentName, namespace); waitForDeploymentPodsToBeDeleted(podLabels, namespace); - service.getMetadata().setNamespace(namespace); - coreV1Api.deleteNamespacedService(service.getMetadata().getName(), service.getMetadata().getNamespace(), + if (service != null) { + service.getMetadata().setNamespace(namespace); + coreV1Api.deleteNamespacedService(service.getMetadata().getName(), service.getMetadata().getNamespace(), null, null, null, null, null, null); - waitForServiceToBeDeleted(service.getMetadata().getName(), namespace); + waitForServiceToBeDeleted(service.getMetadata().getName(), namespace); + } + } catch (Exception e) { throw new RuntimeException(e);