Fixed ItCoherenceTests.testCoherenceServerRollingRestart test class failing intermittently (#3592)

* Fixed ItCoherenceTests.testCoherenceServerRollingRestart test class failing intermittently

Author: hzhao-github

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

@@ -27,7 +27,6 @@
 import oracle.weblogic.kubernetes.annotations.Namespaces;
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
 import oracle.weblogic.kubernetes.utils.ExecResult;
-import oracle.weblogic.kubernetes.utils.FileUtils;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Tag;
@@ -46,6 +45,9 @@
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.verifyRollingRestartOccurred;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkServiceExists;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
+import static oracle.weblogic.kubernetes.utils.FileUtils.copyFolderToPod;
+import static oracle.weblogic.kubernetes.utils.FileUtils.deleteDirectories;
+import static oracle.weblogic.kubernetes.utils.FileUtils.makeDirectories;
 import static oracle.weblogic.kubernetes.utils.ImageUtils.createImageAndVerify;
 import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
 import static oracle.weblogic.kubernetes.utils.ImageUtils.dockerLoginAndPushImageToRegistry;
@@ -192,15 +194,23 @@ private void copyCohProxyClientAppToPods() {
     for (int i = 1; i < replicaCount; i++) {
       String serverName = managedServerPrefix + i;
       assertDoesNotThrow(
-          () -> FileUtils.makeDirectories(domainNamespace, serverName,
+          () -> deleteDirectories(domainNamespace, serverName,
+              null, true, dirsToMake),
+          String.format("Failed to delete dir %s in pod %s in namespace %s ",
+              dirsToMake.toString(), serverName, domainNamespace));
+      logger.info("Deleted dir {0} in Pod {1} in namespace {2} ",
+          dirsToMake.toString(), serverName, domainNamespace);
+
+      assertDoesNotThrow(
+          () -> makeDirectories(domainNamespace, serverName,
               null, true, dirsToMake),
           String.format("Failed to create dir %s in pod %s in namespace %s ",
               dirsToMake.toString(), serverName, domainNamespace));
-      logger.info("Failed to create dir {0} in Pod {1} in namespace {2} ",
+      logger.info("Created dir {0} in Pod {1} in namespace {2} ",
           dirsToMake.toString(), serverName, domainNamespace);
 
       assertDoesNotThrow(
-          () -> FileUtils.copyFolderToPod(domainNamespace, serverName,
+          () -> copyFolderToPod(domainNamespace, serverName,
               containerName, Paths.get(APP_LOC_ON_HOST), Paths.get(APP_LOC_IN_POD)),
           String.format("Failed to copy file %s to pod %s in namespace %s and located at %s ",
               APP_LOC_ON_HOST, serverName, domainNamespace, APP_LOC_IN_POD));

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/FileUtils.java

@@ -302,6 +302,35 @@ public static void makeDirectories(String namespace,
     });
   }
 
+  /**
+   * Delete directories in a pod in the specified namespace.
+   * @param namespace The Kubernetes namespace that the pod is in
+   * @param pod The name of the Kubernetes pod where the command is expected to run
+   * @param container The container in the Pod where the command is to be run. If no
+   *                         container name is provided than the first container in the Pod is used.
+   * @param redirectToStdout copy process output to stdout
+   * @param directoryToDelete directories to be deleted
+   */
+  public static void deleteDirectories(String namespace,
+                                       String pod,
+                                       String container,
+                                       boolean redirectToStdout,
+                                       List<String> directoryToDelete) {
+    //Delete directories.
+    directoryToDelete.forEach(newDir -> {
+      String deleteCmd = "rm -rf " + newDir;
+      getLogger().info("dir to delete {0} ", deleteCmd);
+
+      try {
+        ExecResult execResult = execCommand(namespace,
+            pod, container, redirectToStdout,"/bin/sh", "-c", deleteCmd);
+        getLogger().info("Directory created " + execResult.stdout());
+      } catch (Exception ex) {
+        throw new RuntimeException(ex);
+      }
+    });
+  }
+
   /**
    * Copy file from source directory to destination directory.
    *