svn commit: r1402713 - in /oozie/trunk: core/src/test/java/org/apache/oozie/test/XTestCase.java release-log.txt

[tu...@apache.org]

Author: tucu
Date: Fri Oct 26 23:26:59 2012
New Revision: 1402713

URL: http://svn.apache.org/viewvc?rev=1402713&view=rev
Log:
OOZIE-1027 XTestCase.delete() can cause tests to fail if it runs into a dangling symlink (rkanter via tucu)

Modified:
    oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java
    oozie/trunk/release-log.txt

Modified: oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java?rev=1402713&r1=1402712&r2=1402713&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java Fri Oct 26 23:26:59 2012
@@ -414,6 +414,11 @@ public abstract class XTestCase extends 
                 throw new RuntimeException(XLog.format("could not delete path [{0}]", file.getAbsolutePath()));
             }
         }
+        else {
+            // With a dangling symlink, exists() doesn't return true so try to delete it anyway; we fail silently in case the file
+            // truely doesn't exist
+            file.delete();
+        }
     }
 
     /**

Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1402713&r1=1402712&r2=1402713&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Fri Oct 26 23:26:59 2012
@@ -1,7 +1,8 @@
 -- Oozie 3.4.0 release (trunk - unreleased)
 
+OOZIE-1027 XTestCase.delete() can cause tests to fail if it runs into a dangling symlink (rkanter via tucu)
 OOZIE-1027 Command line mr does not support NN/JT parameters properly (Mona via Mohammad)
-OOZIE-1020 BulkJPAExecutor handling date-time value incorrectly.(Mona via Mohammad)`
+OOZIE-1020 BulkJPAExecutor handling date-time value incorrectly.(Mona via Mohammad)
 OOZIE-967 Coordinator action window in web UI never finishes refreshing (kinley via tucu)
 OOZIE-1024 ooziedb.sh script should keep OOZIE_CONFIG, OOZIE_LOG, and OOZIE_DATA if previously set (rkanter via tucu)
 OOZIE-1023 Docs list OOZIE_CONF instead of OOZIE_CONFIG env var (rkanter via tucu)