This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 3634bf15c5c1eaf35699770b858ab0b29fc4fc97 (commit) from 3c8be08f247f5d7ca4db1c809eefca9d7f1e8c31 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=3634bf15c5c1eaf35699770b8... http://github.com/ceki/logback/commit/3634bf15c5c1eaf35699770b858ab0b29fc4fc... commit 3634bf15c5c1eaf35699770b858ab0b29fc4fc97 Author: Ceki Gulcu <ceki@qos.ch> Date: Tue Oct 25 20:56:28 2011 +0200 make scan1 test in JoranConfiguratorTest more robust diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java index 1e345a2..3f8f5a2 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java @@ -17,6 +17,7 @@ import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.concurrent.TimeUnit; import java.util.logging.LogManager; import ch.qos.logback.classic.jul.JULHelper; @@ -45,6 +46,7 @@ import ch.qos.logback.core.read.ListAppender; import ch.qos.logback.core.status.StatusChecker; import ch.qos.logback.core.testUtil.StringListAppender; + import static org.junit.Assert.*; public class JoranConfiguratorTest { @@ -300,6 +302,9 @@ public class JoranConfiguratorTest { logger.debug("after " + i); } + loggerContext.getExecutorService().shutdown(); + loggerContext.getExecutorService().awaitTermination(1000, TimeUnit.MILLISECONDS); + StatusPrinter.print(loggerContext); StatusChecker checker = new StatusChecker(loggerContext); assertTrue(checker.isErrorFree(0)); diff --git a/logback-core/src/test/java/ch/qos/logback/core/FileAppenderResilienceTest.java b/logback-core/src/test/java/ch/qos/logback/core/FileAppenderResilienceTest.java index 4d74c3f..88d4de9 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/FileAppenderResilienceTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/FileAppenderResilienceTest.java @@ -77,7 +77,7 @@ public class FileAppenderResilienceTest { t.start(); double delayCoefficient = 2.0; - for (int i = 0; i < 3; i++) { + for (int i = 0; i < 5; i++) { Thread.sleep((int)(RecoveryCoordinator.BACKOFF_COEFFICIENT_MIN * delayCoefficient)); closeLogFileOnPurpose(); } @@ -85,7 +85,7 @@ public class FileAppenderResilienceTest { t.join(); double bestCaseSuccessRatio = 1/delayCoefficient; - double lossinessFactor = 0.5; + double lossinessFactor = 0.8; ResilienceUtil .verify(logfileStr, "^hello (\\d{1,5})$", runner.getCounter(), bestCaseSuccessRatio * lossinessFactor); } @@ -109,7 +109,7 @@ class Runner extends RunnableWithCounterAndDone { while (!isDone()) { counter++; fa.doAppend("hello " + counter); - if (counter % 512 == 0) { + if (counter % 128 == 0) { try { Thread.sleep(10); } catch (InterruptedException e) { } } ----------------------------------------------------------------------- Summary of changes: .../classic/joran/JoranConfiguratorTest.java | 5 +++++ .../logback/core/FileAppenderResilienceTest.java | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.