revert change to BaseTest.java

Author: pfmackin

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

@@ -305,7 +305,6 @@ public static ExecResult cleanup() throws Exception {
             + getProjectRoot()
             + "/src/integration-tests/bash/cleanup.sh";
     logger.info("Command to call cleanup script " + cmd);
-
     return ExecCommand.exec(cmd);
   }
 

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

@@ -31,7 +31,6 @@
 import javax.ws.rs.core.Response;
 import oracle.kubernetes.operator.BaseTest;
 import oracle.kubernetes.operator.utils.Operator.RestCertType;
-import org.bouncycastle.i18n.MissingEntryException;
 import org.glassfish.jersey.jsonp.JsonProcessingFeature;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
@@ -151,7 +150,7 @@ public static boolean checkPodTerminatingNoWait(String podName, String domainNS)
     cmd.append("kubectl get pod ").append(podName).append(" -n ").append(domainNS);
 
     // check for admin pod
-    return checkPodMatch(cmd.toString(), "Terminating", podName);
+    return checkPodContains(cmd.toString(), "Terminating", podName);
   }
 
   /**
@@ -1445,7 +1444,7 @@ public static void checkCmdInLoop(String cmd, String matchStr, String k8sObjName
   }
 
   /**
-   * Check if the pod is in a specific status.
+   * Check if the pod output contains the specified string
    *
    * @param cmd        command to execute
    * @param matchStr   matching string
@@ -1454,7 +1453,7 @@ public static void checkCmdInLoop(String cmd, String matchStr, String k8sObjName
    * @return true for match else false
    * @throws Exception
    */
-  public static boolean checkPodMatch(String cmd, String matchStr, String k8sObjName)
+  public static boolean checkPodContains(String cmd, String matchStr, String k8sObjName)
       throws Exception {
       ExecResult result = ExecCommand.exec(cmd);
       if (result.exitValue() != 0