Skip to content

Commit eba6c3d

Browse files
committed
fix based on review comments from Vanaja
1 parent 6389425 commit eba6c3d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

integration-tests/src/test/java/oracle/kubernetes/operator/ITPodsRestart.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ private void verifyPodStatus(String podName, String podStatusExpected)
557557
String domain1LabelSelector = String.format("weblogic.domainUID in (%s)", domainUid);
558558
String namespace = domain.getDomainNS();
559559
boolean gotExpected = false;
560-
for (int i = 0; i < 12; i++) {
560+
for (int i = 0; i < BaseTest.getMaxIterationsPod(); i++) {
561561
if (podStatusExpected.equals("Terminating")) {
562562
if (testUtil.isPodTerminating(namespace, domain1LabelSelector, podName)) {
563563
gotExpected = true;
@@ -569,7 +569,8 @@ private void verifyPodStatus(String podName, String podStatusExpected)
569569
break;
570570
}
571571
}
572-
Thread.sleep(10000);
572+
573+
Thread.sleep(BaseTest.getWaitTimePod() * 1000);
573574
}
574575
Assert.assertTrue("Didn't get the expected pod status", gotExpected);
575576
}

integration-tests/src/test/java/oracle/kubernetes/operator/utils/DomainCRD.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@
1919
import java.nio.file.Path;
2020
import java.nio.file.Paths;
2121
import java.util.Map;
22+
import java.util.logging.Logger;
2223

2324
/** A Domain CRD utility class to manipulate domain yaml files */
2425
public class DomainCRD {
2526

2627
private final ObjectMapper objectMapper;
2728
private final JsonNode root;
29+
public static final Logger logger = Logger.getLogger("OperatorIT", "OperatorIT");
2830

2931
/**
3032
* Constructor to read the yaml file and initialize the root JsonNode with yaml equivalent of JSON
@@ -140,7 +142,7 @@ private JsonNode getClusterNode(String clusterName) {
140142
JsonNode clusterNode = null;
141143
for (JsonNode cluster : clusters) {
142144
if (cluster.get("clusterName").asText().equals(clusterName)) {
143-
System.out.println("Got the cluster");
145+
logger.info("Got the cluster");
144146
clusterNode = cluster;
145147
}
146148
}
@@ -157,7 +159,7 @@ private JsonNode getManagedServerNode(String managedServerName) {
157159
ArrayNode managedservers = null;
158160
JsonNode managedserverNode = null;
159161
if (root.path("spec").path("managedServers").isMissingNode()) {
160-
System.out.println("Missing MS Node");
162+
logger.info("Missing MS Node");
161163
managedservers = objectMapper.createArrayNode();
162164
ObjectNode managedserver = objectMapper.createObjectNode();
163165
managedserver.put("serverName", managedServerName);
@@ -178,9 +180,6 @@ private JsonNode getManagedServerNode(String managedServerName) {
178180
managedservers.add(managedserver);
179181
}
180182
}
181-
if (root.path("spec").path("managedServers").isMissingNode()) {
182-
System.out.println("YES IT IS STILL MISSING");
183-
}
184183
return managedserverNode;
185184
}
186185

0 commit comments

Comments
 (0)