changes to use ExecCommand and ExecResult

Author: vanajamukkara

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

@@ -8,6 +8,8 @@
 import java.nio.file.Paths;
 import java.util.Properties;
 import java.util.logging.Logger;
+import oracle.kubernetes.operator.utils.ExecCommand;
+import oracle.kubernetes.operator.utils.ExecResult;
 import oracle.kubernetes.operator.utils.TestUtils;
 
 /**
@@ -84,9 +86,10 @@ public static void initialize(String appPropsFile) throws Exception {
     if (System.getenv("WERCKER") == null && System.getenv("JENKINS") == null) {
       logger.info("Creating PVROOT " + pvRoot);
       Files.createDirectories(Paths.get(pvRoot));
-      String output = TestUtils.executeCommand("chmod 777 " + pvRoot);
-      if (!output.trim().equals("")) {
-        throw new RuntimeException("FAILURE: Couldn't change permissions for PVROOT " + output);
+      ExecResult result = ExecCommand.exec("chmod 777 " + pvRoot);
+      if (result.exitValue() != 0) {
+        throw new RuntimeException(
+            "FAILURE: Couldn't change permissions for PVROOT " + result.stderr());
       }
     }
 
@@ -135,10 +138,10 @@ public static String getLeaseId() {
     return leaseId;
   }
 
-  protected void logTestBegin() throws Exception {
+  protected void logTestBegin(String testName) throws Exception {
     logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
-    logger.info("BEGIN");
-    // renew lease at the begining for every test method, leaseId is set only for Wercker
+    logger.info("BEGIN " + testName);
+    // renew lease at the beginning for every test method, leaseId is set only for Wercker
     TestUtils.renewK8sClusterLease(getProjectRoot(), getLeaseId());
   }
 }

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

@@ -6,6 +6,8 @@
 
 import java.util.Properties;
 import oracle.kubernetes.operator.utils.Domain;
+import oracle.kubernetes.operator.utils.ExecCommand;
+import oracle.kubernetes.operator.utils.ExecResult;
 import oracle.kubernetes.operator.utils.Operator;
 import oracle.kubernetes.operator.utils.TestUtils;
 import org.junit.AfterClass;
@@ -86,15 +88,18 @@ public static void staticUnPrepare() throws Exception {
       if (domain != null) domain.destroy();
       if (operator != null) operator.destroy();
     } finally {
-      // TestUtils.cleanupAll(getProjectRoot());
-      TestUtils.executeCommandStrArray(
+      String cmd =
           "export RESULT_ROOT="
               + getResultRoot()
               + " export PV_ROOT="
               + getPvRoot()
               + " && "
               + getProjectRoot()
-              + "/src/integration-tests/bash/cleanup.sh");
+              + "/src/integration-tests/bash/cleanup.sh";
+      ExecResult result = ExecCommand.exec(cmd);
+      if (result.exitValue() != 0) {
+        logger.info("FAILED: command to call cleanup script failed " + cmd + result.stderr());
+      }
     }
     logger.info("SUCCESS");
   }
@@ -106,7 +111,7 @@ public static void staticUnPrepare() throws Exception {
    */
   @Test
   public void testAdminServerExternalService() throws Exception {
-    logTestBegin();
+    logTestBegin("testAdminServerExternalService");
     domain.verifyAdminServerExternalService(getUsername(), getPassword());
     logger.info("SUCCESS");
   }
@@ -118,7 +123,7 @@ public void testAdminServerExternalService() throws Exception {
    */
   @Test
   public void testAdminT3Channel() throws Exception {
-    logTestBegin();
+    logTestBegin("testAdminT3Channel");
     // check if the property is set to true
     Boolean exposeAdmint3Channel = new Boolean(domainProps.getProperty("exposeAdminT3Channel"));
 
@@ -143,7 +148,7 @@ public void testAdminT3Channel() throws Exception {
    */
   @Test
   public void testDomainLifecyle() throws Exception {
-    logTestBegin();
+    logTestBegin("testDomainLifecyle");
     domain.destroy();
     domain.create();
     operator.verifyExternalRESTService();
@@ -162,7 +167,7 @@ public void testDomainLifecyle() throws Exception {
    */
   @Test
   public void testClusterScaling() throws Exception {
-    logTestBegin();
+    logTestBegin("testClusterScaling");
     String managedServerNameBase = domainProps.getProperty("managedServerNameBase");
     int replicas = 3;
     String podName = domainUid + "-" + managedServerNameBase + replicas;
@@ -219,7 +224,7 @@ public void testClusterScaling() throws Exception {
    */
   @Test
   public void testOperatorLifecycle() throws Exception {
-    logTestBegin();
+    logTestBegin("testOperatorLifecycle");
     operator.destroy();
     operator.create();
     operator.verifyExternalRESTService();