From ddafb6dc88f63265cdc8201b042be7f5feb78d42 Mon Sep 17 00:00:00 2001 From: Steve Hawkins Date: Fri, 3 Mar 2023 13:16:23 -0500 Subject: [PATCH] fix #4924: speeding up the pod exec tests --- .../kubernetes/client/mock/PodExecTest.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodExecTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodExecTest.java index 0b4dad826ee..eccdcde5c62 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodExecTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodExecTest.java @@ -16,6 +16,8 @@ package io.fabric8.kubernetes.client.mock; import io.fabric8.kubernetes.api.model.PodBuilder; +import io.fabric8.kubernetes.api.model.PodStatus; +import io.fabric8.kubernetes.api.model.PodStatusBuilder; import io.fabric8.kubernetes.api.model.Status; import io.fabric8.kubernetes.api.model.StatusBuilder; import io.fabric8.kubernetes.client.KubernetesClient; @@ -41,6 +43,9 @@ @EnableKubernetesMockClient(crud = true) class PodExecTest { + private static PodStatus READY = new PodStatusBuilder().addNewCondition().withType("Ready").withStatus("True").endCondition() + .build(); + private KubernetesMockServer server; private KubernetesClient client; @@ -52,7 +57,7 @@ void setUp() { @Test @DisplayName("With no containers, should throw exception") void withNoContainers() { - client.pods().resource(new PodBuilder().withNewMetadata().withName("no-containers").endMetadata().build()) + client.pods().resource(new PodBuilder().withNewMetadata().withName("no-containers").endMetadata().withStatus(READY).build()) .createOrReplace(); final PodResource pr = client.pods().withName("no-containers"); assertThatThrownBy(() -> pr.exec("sh", "-c", "echo Greetings Professor Falken")) @@ -68,7 +73,7 @@ void withSingleContainer() throws Exception { .addNewContainer() .withName("the-single-container") .endContainer() - .endSpec() + .endSpec().withStatus(READY) .build()) .createOrReplace(); server.expect() @@ -92,7 +97,7 @@ void withSingleContainerAndInContainer() { .addNewContainer() .withName("the-single-container") .endContainer() - .endSpec() + .endSpec().withStatus(READY) .build()) .createOrReplace(); final ContainerResource cr = client.pods().withName("single-container").inContainer("non-existent"); @@ -108,7 +113,7 @@ void execNoStreams() throws Exception { .addNewContainer() .withName("the-first-container") .endContainer() - .endSpec() + .endSpec().withStatus(READY) .build()) .createOrReplace(); PodResource op = client.pods().withName("name"); @@ -126,7 +131,7 @@ void withMultipleContainers() throws Exception { .addNewContainer() .withName("the-second-container") .endContainer() - .endSpec() + .endSpec().withStatus(READY) .build()) .createOrReplace(); server.expect() @@ -153,7 +158,7 @@ void withMultipleContainersAndInContainer() throws Exception { .addNewContainer() .withName("the-second-container") .endContainer() - .endSpec() + .endSpec().withStatus(READY) .build()) .createOrReplace(); server.expect()