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 85f6de721d775b96e4f29dd39f6554d32ec9741a (commit) from a3423c5ec6e11b19562964017bbcd15e34980e09 (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=85f6de721d775b96e4f29dd39... http://github.com/ceki/logback/commit/85f6de721d775b96e4f29dd39f6554d32ec974... commit 85f6de721d775b96e4f29dd39f6554d32ec9741a Author: Ceki Gulcu <ceki@qos.ch> Date: Wed Mar 31 18:19:42 2010 +0200 - DBAppenderIntegrationTest and SiftingAppenderTest collided on MDC key userid the MDC used in DBAppenderIntegrationTest is suffixed with a random int value to avoid collisions diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java index dc0a58a..a5ebd40 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java @@ -92,7 +92,9 @@ public class DBAppenderIntegrationTest { Logger logger = lc.getLogger(DBAppenderIntegrationTest.class); - MDC.put("userid", "user" + diff); + // the key userid is used in SiftingAppender test + // suffix with diff to avoid collision + MDC.put("userid"+diff, "user" + diff); int runLength = 5; for (int i = 1; i <= runLength; i++) { logger.debug("This is a debug message. Message number: " + (diff + i)); diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/sift/SiftingAppenderTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/sift/SiftingAppenderTest.java index 4bf89ac..1d05659 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/sift/SiftingAppenderTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/sift/SiftingAppenderTest.java @@ -46,7 +46,8 @@ public class SiftingAppenderTest { LoggerContext loggerContext = new LoggerContext(); Logger logger = loggerContext.getLogger(this.getClass().getName()); Logger root = loggerContext.getLogger(Logger.ROOT_LOGGER_NAME); - + StatusChecker sc = new StatusChecker(loggerContext); + void configure(String file) throws JoranException { JoranConfigurator jc = new JoranConfigurator(); jc.setContext(loggerContext); @@ -92,7 +93,6 @@ public class SiftingAppenderTest { StatusPrinter.printInCaseOfErrorsOrWarnings(loggerContext); assertNotNull(nopa); - StatusChecker sc = new StatusChecker(loggerContext); assertTrue(sc.containsMatch(ErrorStatus.ERROR, "No nested appenders found")); assertTrue(sc.containsMatch(ErrorStatus.ERROR, "Failed to build an appender for discriminating value \\[smoke\\]")); @@ -113,7 +113,6 @@ public class SiftingAppenderTest { StatusPrinter.printInCaseOfErrorsOrWarnings(loggerContext); assertNotNull(listAppender); - StatusChecker sc = new StatusChecker(loggerContext); assertTrue(sc.containsMatch(ErrorStatus.ERROR, "Only and only one appender can be nested")); } ----------------------------------------------------------------------- Summary of changes: .../classic/db/DBAppenderIntegrationTest.java | 4 +++- .../logback/classic/sift/SiftingAppenderTest.java | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.