svn commit: r1627925 - in /zookeeper/branches/branch-3.5: CHANGES.txt src/java/test/org/apache/zookeeper/test/TruncateTest.java

[ra...@apache.org]

Author: rakeshr
Date: Sat Sep 27 06:28:07 2014
New Revision: 1627925

URL: http://svn.apache.org/r1627925
Log:
ZOOKEEPER-2047 testTruncationNullLog fails on windows (flavio via rakeshr)

Modified:
    zookeeper/branches/branch-3.5/CHANGES.txt
    zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/TruncateTest.java

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1627925&r1=1627924&r2=1627925&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Sat Sep 27 06:28:07 2014
@@ -3,6 +3,7 @@ Unreleased
 NEW FEATURES:
 
 BUGFIXES:
+  ZOOKEEPER-2047 testTruncationNullLog fails on windows (flavio via rakeshr)
 
 IMPROVEMENTS:
   ZOOKEEPER-1660 Documentation for Dynamic Reconfiguration (Reed Wanderman-Milne via shralex)

Modified: zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/TruncateTest.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/TruncateTest.java?rev=1627925&r1=1627924&r2=1627925&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/TruncateTest.java (original)
+++ zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/TruncateTest.java Sat Sep 27 06:28:07 2014
@@ -123,9 +123,11 @@ public class TruncateTest extends ZKTest
         for (int i = 1; i <= 100; i++) {
             append(zkdb, i);
         }
+        zkdb.close();
         File[] logs = snaplog.getDataDir().listFiles();
         for(int i = 0; i < logs.length; i++) {
-            logs[i].delete();
+            LOG.debug("Deleting: {}", logs[i].getName());
+            Assert.assertTrue("Failed to delete log file: " + logs[i].getName(), logs[i].delete());
         }
         try {
             zkdb.truncateLog(1);