Skip to content

Commit d678aea

Browse files
committed
bug: fixing integrationtests for nginx
1 parent 3f89ee5 commit d678aea

File tree

1 file changed

+23
-16
lines changed

1 file changed

+23
-16
lines changed

src/test/groovy/com/cloudogu/gitops/integration/GOPSmoketestsIT.groovy

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import com.cloudogu.gitops.integration.features.KubenetesApiTestSetup
44
import io.kubernetes.client.openapi.models.V1NamespaceList
55
import io.kubernetes.client.openapi.models.V1Pod
66
import io.kubernetes.client.openapi.models.V1PodList
7+
import io.kubernetes.client.openapi.models.V1Service
8+
import io.kubernetes.client.openapi.models.V1ServiceList
79
import org.junit.jupiter.api.BeforeAll
810
import org.junit.jupiter.api.Test
911

@@ -57,24 +59,24 @@ class GOPSmoketestsIT extends KubenetesApiTestSetup {
5759
}
5860

5961
@Test
60-
void ensusreNamespacesExists() {
62+
void ensureNamespacesExists() {
6163
List<String> expectedNamespaces = ["argocd",
62-
"cert-manager",
63-
"default",
64-
"example-apps-production",
65-
"example-apps-staging",
66-
"ingress-nginx",
67-
"kube-node-lease",
68-
"kube-public",
69-
"kube-system",
70-
"monitoring",
71-
"secrets"] as List<String>
64+
"cert-manager",
65+
"default",
66+
"example-apps-production",
67+
"example-apps-staging",
68+
"ingress-nginx",
69+
"kube-node-lease",
70+
"kube-public",
71+
"kube-system",
72+
"monitoring",
73+
"secrets"] as List<String>
7274

7375

7476
V1NamespaceList list = api.listNamespace().execute()
7577
// list.items.each {println it.getMetadata().getName()} // print namespaces
7678
List<String> listOfNamespaces = list.getItems().collect { it.getMetadata().name }
77-
assertThat(expectedNamespaces).containsAll (listOfNamespaces)
79+
assertThat(expectedNamespaces).containsAll(listOfNamespaces)
7880

7981
}
8082

@@ -101,11 +103,16 @@ class GOPSmoketestsIT extends KubenetesApiTestSetup {
101103
@Override
102104
boolean isReadyToStartTests() {
103105
V1PodList list = api.listPodForAllNamespaces()
104-
.execute();
105-
if (list && !list.items.isEmpty()) {
106+
.execute()
107+
V1ServiceList services = api.listServiceForAllNamespaces()
108+
.execute()
109+
if (list && !list.items.isEmpty() &&
110+
services && !services.items.isEmpty()) {
111+
112+
V1Pod argoPod = list.getItems().find { it.getMetadata().getName().startsWith("argo")}
113+
V1Service service = services.getItems()find { it.getMetadata().getName().startsWith("ingress")}
106114

107-
V1Pod argoPod = list.getItems().find { it.getMetadata().getName().startsWith("argo") }
108-
if (argoPod) {
115+
if (argoPod && service) {
109116
return true
110117
}
111118
}

0 commit comments

Comments
 (0)