Skip to content

Commit b7087d6

Browse files
authored
fix intermittent test issue in ItLivenessProbeCustomization#testCustomLivenessProbeFailureThresholdSuccessThreshold (#3651)
* fix intermittent test issue in ItLivenessProbeCustomization#testCustomLivenessProbeFailureThresholdSuccessThreshold
1 parent 6ee4147 commit b7087d6

File tree

1 file changed

+36
-1
lines changed

1 file changed

+36
-1
lines changed

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItLivenessProbeCustomization.java

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ class ItLivenessProbeCustomization {
9595
private static final int replicaCount = 1;
9696
private static final int NUMBER_OF_CLUSTERS_MIIDOMAIN = 2;
9797
private static final String adminServerPodName = domainUid + "-" + ADMIN_SERVER_NAME_BASE;
98-
private static final String adminServerPodName2 = domainUid2 + "-" + ADMIN_SERVER_NAME_BASE;
9998
private static final String APPCHECK_SCRIPT = "customLivenessProbe.sh";
10099
private static final String COPY_CMD = "copy-cmd.txt";
101100
private static final String internalPort = "8001";
@@ -330,6 +329,18 @@ void testCustomLivenessProbeFailureThresholdSuccessThreshold() {
330329
}
331330
}
332331

332+
// check the admin server is up and running
333+
checkPodReadyAndServiceExists(adminServerPodName, domainUid, domainNamespace);
334+
335+
// check the managed servers are up and running
336+
for (int i = 1; i <= NUMBER_OF_CLUSTERS_MIIDOMAIN; i++) {
337+
for (int j = 1; j <= replicaCount; j++) {
338+
String managedServerPodName =
339+
domainUid + "-" + CLUSTER_NAME_PREFIX + i + "-" + MANAGED_SERVER_NAME_BASE + j;
340+
checkPodReadyAndServiceExists(managedServerPodName, domainUid, domainNamespace);
341+
}
342+
}
343+
333344
// check the livenessProbe failureThreshold and successThreshold after the domain got patched
334345
domain1 = assertDoesNotThrow(() -> getDomainCustomResource(domainUid, domainNamespace),
335346
String.format("getDomainCustomResource failed with ApiException when tried to get domain %s in namespace %s",
@@ -667,6 +678,18 @@ void testCustomReadinessProbeFailureThresholdSuccessThreshold() {
667678
}
668679
}
669680

681+
// check the admin server is up and running
682+
checkPodReadyAndServiceExists(adminServerPodName, domainUid, domainNamespace);
683+
684+
// check the managed servers are up and running
685+
for (int i = 1; i <= NUMBER_OF_CLUSTERS_MIIDOMAIN; i++) {
686+
for (int j = 1; j <= replicaCount; j++) {
687+
String managedServerPodName =
688+
domainUid + "-" + CLUSTER_NAME_PREFIX + i + "-" + MANAGED_SERVER_NAME_BASE + j;
689+
checkPodReadyAndServiceExists(managedServerPodName, domainUid, domainNamespace);
690+
}
691+
}
692+
670693
// check the readinessProbe failureThreshold and successThreshold after the domain got patched
671694
domain1 = assertDoesNotThrow(() -> getDomainCustomResource(domainUid, domainNamespace),
672695
String.format("getDomainCustomResource failed with ApiException when tried to get domain %s in namespace %s",
@@ -726,6 +749,18 @@ void testCustomReadinessProbeFailureThresholdSuccessThreshold() {
726749
managedServerPodsCreationTime.get(managedServerPodName));
727750
}
728751
}
752+
753+
// check the admin server is up and running
754+
checkPodReadyAndServiceExists(adminServerPodName, domainUid, domainNamespace);
755+
756+
// check the managed servers are up and running
757+
for (int i = 1; i <= NUMBER_OF_CLUSTERS_MIIDOMAIN; i++) {
758+
for (int j = 1; j <= replicaCount; j++) {
759+
String managedServerPodName =
760+
domainUid + "-" + CLUSTER_NAME_PREFIX + i + "-" + MANAGED_SERVER_NAME_BASE + j;
761+
checkPodReadyAndServiceExists(managedServerPodName, domainUid, domainNamespace);
762+
}
763+
}
729764
}
730765

731766
/**

0 commit comments

Comments
 (0)