Skip to content

Commit a35ed12

Browse files
committed
Fix org.csanchez.jenkins.plugins.kubernetes.pipeline.KubernetesPipelineTest#runInPodWithRetention
1 parent 87099b9 commit a35ed12

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/test/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesTestUtil.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,7 @@ public static boolean deletePods(KubernetesClient client, Map<String, String> la
239239
PodList list = client.pods().withLabels(labels).list();
240240
if (!list.getItems().isEmpty()) {
241241
LOGGER.log(WARNING, "Deleting leftover pods: {0}", print(list));
242-
if (Boolean.TRUE.equals(client.pods().withLabels(labels).delete())) {
243-
return true;
244-
}
245-
242+
return client.pods().withLabels(labels).delete().size() > 0;
246243
}
247244
}
248245
return false;

src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineTest.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@
4242
import static org.junit.Assert.assertTrue;
4343
import static org.junit.Assume.*;
4444

45+
import io.fabric8.kubernetes.api.model.StatusDetails;
46+
import io.fabric8.kubernetes.client.KubernetesClient;
4547
import java.util.Arrays;
46-
import java.util.Collections;
4748
import java.util.List;
4849
import java.util.Map;
4950
import java.util.Optional;
@@ -460,7 +461,10 @@ public void runWithActiveDeadlineSeconds() throws Exception {
460461
@Test
461462
public void runInPodWithRetention() throws Exception {
462463
r.assertBuildStatusSuccess(r.waitForCompletion(b));
463-
assertTrue(deletePods(cloud.connect(), getLabels(this, name), true));
464+
System.out.println("Deleting leftover pods");
465+
KubernetesClient client = cloud.connect();
466+
Map<String, String> labels = getLabels(this, name);
467+
assertTrue(client.pods().withLabels(labels).delete().size() > 0);
464468
}
465469

466470
@Issue("JENKINS-49707")

0 commit comments

Comments
 (0)