Repository: geode Updated Branches: refs/heads/develop 8fa754586 -> f78fc7126
GEODE-3177 RollingUpgradeDUnitTest & RollingUpgrade2DUnitTest suspect strings Changed the tests to only use deleteDirectory() on directories. For other files we just use File.delete(). Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/f78fc712 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/f78fc712 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/f78fc712 Branch: refs/heads/develop Commit: f78fc71269ac097914f44f26606a0d130b574c42 Parents: 8fa7545 Author: Bruce Schuchardt <[email protected]> Authored: Mon Jul 10 13:48:04 2017 -0700 Committer: Bruce Schuchardt <[email protected]> Committed: Mon Jul 10 13:49:16 2017 -0700 ---------------------------------------------------------------------- .../cache/rollingupgrade/RollingUpgrade2DUnitTest.java | 6 +++++- .../internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/f78fc712/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java index 3d606d8..13a040d 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java @@ -161,7 +161,11 @@ public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase { File pwd = new File("."); for (File entry : pwd.listFiles()) { try { - FileUtils.deleteDirectory(entry); + if (entry.isDirectory()) { + FileUtils.deleteDirectory(entry); + } else { + entry.delete(); + } } catch (Exception e) { System.out.println("Could not delete " + entry + ": " + e.getMessage()); } http://git-wip-us.apache.org/repos/asf/geode/blob/f78fc712/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java index 0940ea6..f28eb0d 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java @@ -97,7 +97,11 @@ public class RollingUpgradeDUnitTest extends JUnit4DistributedTestCase { File pwd = new File("."); for (File entry : pwd.listFiles()) { try { - FileUtils.deleteDirectory(entry); + if (entry.isDirectory()) { + FileUtils.deleteDirectory(entry); + } else { + entry.delete(); + } } catch (Exception e) { System.out.println("Could not delete " + entry + ": " + e.getMessage()); }
