From d439058392e5130f351d455132666d2d4f8c650a Mon Sep 17 00:00:00 2001 From: Ivan Vilata-i-Balaguer Date: Wed, 27 Apr 2016 14:26:47 +0200 Subject: [PATCH] Check that network stress test data directory variable is not empty --- .../java/io/bitsquare/p2p/network/NetworkStressTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/network/src/test/java/io/bitsquare/p2p/network/NetworkStressTest.java b/network/src/test/java/io/bitsquare/p2p/network/NetworkStressTest.java index 628abad4fb..51c358a576 100644 --- a/network/src/test/java/io/bitsquare/p2p/network/NetworkStressTest.java +++ b/network/src/test/java/io/bitsquare/p2p/network/NetworkStressTest.java @@ -159,8 +159,8 @@ public class NetworkStressTest { private Path createTestDataDirectory() throws IOException { Path stressTestDirPath; - String stressTestDir = System.getenv(TEST_DIR_ENVVAR); - if (stressTestDir != null) { + final String stressTestDir = System.getenv(TEST_DIR_ENVVAR); + if ((stressTestDir != null) && !stressTestDir.equals("")) { // Test directory specified, use and create if missing. stressTestDirPath = Paths.get(stressTestDir); if (!Files.isDirectory(stressTestDirPath)) { @@ -181,7 +181,8 @@ public class NetworkStressTest { */ private void deleteTestDataDirectory() throws IOException { // Based on by Tomasz Dzięcielewski. - boolean keep = System.getenv(TEST_DIR_ENVVAR) != null; // do not remove if given explicitly + final String stressTestDir = System.getenv(TEST_DIR_ENVVAR); + final boolean keep = (stressTestDir != null) && !stressTestDir.equals(""); Files.walkFileTree(testDataDir, new SimpleFileVisitor() { @Override public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {