Repository: logging-log4j2 Updated Branches: refs/heads/master f3e876a0f -> 8ad4b2a42
Fix failing test on Windows 7. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8ad4b2a4 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8ad4b2a4 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8ad4b2a4 Branch: refs/heads/master Commit: 8ad4b2a4223e90cd13279499980c0770088c993c Parents: f3e876a Author: Gary Gregory <[email protected]> Authored: Mon Sep 26 19:09:57 2016 -0700 Committer: Gary Gregory <[email protected]> Committed: Mon Sep 26 19:09:57 2016 -0700 ---------------------------------------------------------------------- .../apache/log4j/config/Log4j1ConfigurationFactoryTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8ad4b2a4/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java ---------------------------------------------------------------------- diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java index 9d9a294..e9fc5cf 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java @@ -24,10 +24,10 @@ import static org.junit.Assert.assertTrue; import java.io.File; import java.net.URISyntaxException; import java.net.URL; - import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; +import java.util.concurrent.TimeUnit; + import org.apache.log4j.layout.Log4j1XmlLayout; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.Appender; @@ -173,7 +173,8 @@ public class Log4j1ConfigurationFactoryTest { final Configuration configuration = getConfiguration("config-1.2/log4j-system-properties-2.properties"); final RollingFileAppender appender = configuration.getAppender("RFA"); assertEquals("${java.io.tmpdir}/hadoop.log", appender.getFileName()); - Path path = new File(appender.getFileName()).toPath(); + appender.stop(10, TimeUnit.SECONDS); + Path path = new File(appender.getFileName()).toPath(); Files.deleteIfExists(path); path = new File("${java.io.tmpdir}").toPath(); Files.deleteIfExists(path);
