Repository: logging-log4j2 Updated Branches: refs/heads/master ba6105768 -> b1a09ce32
LOG4J2-1275 - Fix RollingAppenderNoUnconditionalDeleteTest repeat test runs from failing Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b1a09ce3 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b1a09ce3 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b1a09ce3 Branch: refs/heads/master Commit: b1a09ce32c975bc0af53b6b9025894986816c9b7 Parents: ba61057 Author: Matt Sicker <[email protected]> Authored: Wed Mar 2 20:14:27 2016 -0600 Committer: Matt Sicker <[email protected]> Committed: Wed Mar 2 20:14:27 2016 -0600 ---------------------------------------------------------------------- ...ollingAppenderNoUnconditionalDeleteTest.java | 22 ++++++++++++-------- src/changes/changes.xml | 3 +++ 2 files changed, 16 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b1a09ce3/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderNoUnconditionalDeleteTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderNoUnconditionalDeleteTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderNoUnconditionalDeleteTest.java index a0379d7..f25a9e7 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderNoUnconditionalDeleteTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderNoUnconditionalDeleteTest.java @@ -25,7 +25,6 @@ import java.util.List; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.junit.LoggerContextRule; -import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -60,6 +59,8 @@ public class RollingAppenderNoUnconditionalDeleteTest { public RollingAppenderNoUnconditionalDeleteTest(final String configFile, final String dir) { this.directory = new File(dir); this.init = new LoggerContextRule(configFile); + deleteDir(); + deleteDirParent(); } @Before @@ -67,11 +68,6 @@ public class RollingAppenderNoUnconditionalDeleteTest { this.logger = this.init.getLogger(); } - @After - public void tearDown() throws Exception { - deleteDir(); - } - @Test public void testAppender() throws Exception { final int LINECOUNT = 18; // config has max="100" @@ -93,12 +89,20 @@ public class RollingAppenderNoUnconditionalDeleteTest { } private void deleteDir() { - if (directory.exists()) { - final File[] files = directory.listFiles(); + deleteDir(directory); + } + + private void deleteDirParent() { + deleteDir(directory.getParentFile()); + } + + private void deleteDir(File dir) { + if (dir.exists()) { + final File[] files = dir.listFiles(); for (final File file : files) { file.delete(); } - directory.delete(); + dir.delete(); } } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b1a09ce3/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 2dceed8..eaf24b5 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -175,6 +175,9 @@ <action issue="LOG4J2-1303" dev="mattsicker" type="add"> Add documentation links to runtime dependencies in each component intro page. </action> + <action issue="LOG4J2-1275" dev="mattsicker" type="fix" due-to="Ludovic Hochet"> + Fix RollingAppenderNoUnconditionalDeleteTest repeat test runs from failing. + </action> </release> <release version="2.5" date="2015-12-06" description="GA Release 2.5"> <action issue="LOG4J2-324" dev="rpopma" type="fix">
