Updated Branches: refs/heads/flume-1.4 bac060820 -> 0fefd95b8
FLUME-2060. Failure in TestLog.testReplaySucceedsWithUnusedEmptyLogMetaDataFastReplay test on Windows (Roshan Naik via Hari Shreedharan) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/0fefd95b Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/0fefd95b Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/0fefd95b Branch: refs/heads/flume-1.4 Commit: 0fefd95b88e2b836f871d1f1b1c849e8a97eb760 Parents: bac0608 Author: Hari Shreedharan <[email protected]> Authored: Tue Jun 18 17:56:22 2013 -0700 Committer: Hari Shreedharan <[email protected]> Committed: Tue Jun 18 17:56:22 2013 -0700 ---------------------------------------------------------------------- .../src/test/java/org/apache/flume/channel/file/TestLog.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/0fefd95b/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestLog.java ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestLog.java b/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestLog.java index 8a5f8ad..d1f51fc 100644 --- a/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestLog.java +++ b/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestLog.java @@ -47,6 +47,7 @@ public class TestLog { public void setup() throws IOException { transactionID = 0; checkpointDir = Files.createTempDir(); + FileUtils.forceDeleteOnExit(checkpointDir); Assert.assertTrue(checkpointDir.isDirectory()); dataDirs = new File[3]; for (int i = 0; i < dataDirs.length; i++) { @@ -415,8 +416,9 @@ public class TestLog { FlumeEventPointer eventPointer = log.put(transactionID, eventIn); log.commitPut(transactionID); // this is not required since log.close(); - FileUtils.deleteDirectory(checkpointDir); - Assert.assertTrue(checkpointDir.mkdir()); + checkpointDir = Files.createTempDir(); + FileUtils.forceDeleteOnExit(checkpointDir); + Assert.assertTrue(checkpointDir.isDirectory()); log = new Log.Builder().setCheckpointInterval(1L).setMaxFileSize( MAX_FILE_SIZE).setQueueSize(CAPACITY).setCheckpointDir( checkpointDir).setLogDirs(dataDirs)
