Skip to content

Commit af985a4

Browse files
committed
Checking to see if the PV_ROOT alrteady exists
Signed-off-by: sankar <[email protected]>
1 parent f30fb1f commit af985a4

File tree

1 file changed

+23
-7
lines changed
  • integration-tests/src/test/java/oracle/kubernetes/operator

1 file changed

+23
-7
lines changed

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

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.util.Map;
1010
import java.util.Properties;
1111
import java.util.logging.FileHandler;
12+
import java.util.logging.Level;
1213
import java.util.logging.Logger;
1314
import java.util.logging.SimpleFormatter;
1415
import javax.jms.Connection;
@@ -96,21 +97,36 @@ public static void initialize(String appPropsFile) throws Exception {
9697
+ clnResult.stderr());
9798
}
9899
// create resultRoot, PVRoot, etc
99-
Files.createDirectories(Paths.get(resultRoot));
100-
Files.createDirectories(Paths.get(resultDir));
101-
Files.createDirectories(Paths.get(userProjectsDir));
100+
if (Files.notExists(Paths.get(resultRoot))) {
101+
logger.log(Level.INFO, "Creating {0}", resultRoot);
102+
Files.createDirectories(Paths.get(resultRoot));
103+
}
104+
if (Files.notExists(Paths.get(resultDir))) {
105+
logger.log(Level.INFO, "Creating {0}", resultDir);
106+
Files.createDirectories(Paths.get(resultDir));
107+
}
108+
if (Files.notExists(Paths.get(userProjectsDir))) {
109+
logger.log(Level.INFO, "Creating {0}", userProjectsDir);
110+
Files.createDirectories(Paths.get(userProjectsDir));
111+
}
102112

103113
// create file handler
104-
FileHandler fh = new FileHandler(resultDir + "/java_test_suite.out");
114+
FileHandler fh = new FileHandler(resultDir + "/java_test_suite.out", true);
105115
SimpleFormatter formatter = new SimpleFormatter();
106116
fh.setFormatter(formatter);
107117
logger.addHandler(fh);
108-
logger.info("Adding file handler, logging to file at " + resultDir + "/java_test_suite.out");
118+
logger.log(
119+
Level.INFO, "Adding file handler, logging to file at {0}/java_test_suite.out", resultDir);
109120

110121
// for manual/local run, create file handler, create PVROOT
111122
if (System.getenv("WERCKER") == null && System.getenv("JENKINS") == null) {
112-
logger.info("Creating PVROOT " + pvRoot);
113-
Files.createDirectories(Paths.get(pvRoot));
123+
logger.log(Level.INFO, "Creating PVROOT {0}", pvRoot);
124+
if (Files.notExists(Paths.get(pvRoot))) {
125+
logger.log(Level.INFO, "Creating {0}", pvRoot);
126+
Files.createDirectories(Paths.get(pvRoot));
127+
} else {
128+
logger.log(Level.INFO, "{0} already exists, skipping...", pvRoot);
129+
}
114130
ExecResult result = ExecCommand.exec("chmod 777 " + pvRoot);
115131
if (result.exitValue() != 0) {
116132
throw new RuntimeException(

0 commit comments

Comments
 (0)