The branch, master has been updated via df94eb13158d50083add57207aeda455983b42b9 (commit) from 14c0e07767c55dfc29dcbe181e6298d46ce00ca2 (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=df94eb13158d50083add57207... http://github.com/ceki/logback/commit/df94eb13158d50083add57207aeda455983b42... commit df94eb13158d50083add57207aeda455983b42b9 Author: Ceki Gulcu <ceki@rhino.localdomain> Date: Wed Dec 2 17:25:30 2009 -0500 lowering expectations diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java index fe9a0c8..096dda2 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java @@ -140,7 +140,7 @@ public class TimeBasedRollingWithConfigFileTest extends // match exactly the expected archive files. Thus, we aim for // an approximate match assertTrue("exitenceCount=" + eCount + ", expectedFilenameList.size=" - + expectedFilenameList.size(), eCount >= 5 + + expectedFilenameList.size(), eCount >= 4 && eCount > expectedFilenameList.size() / 2); } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java index 6d08674..19c74a2 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java @@ -142,8 +142,7 @@ public class ReconfigureOnChangeTest { public void directPerfTest() throws MalformedURLException { if (Env.isLinux()) { // for some reason this test does not pass on Linux (AMD 64 bit, - // Dual Core - // Opteron 170) + // Dual Core Opteron 170) return; } ----------------------------------------------------------------------- Summary of changes: .../TimeBasedRollingWithConfigFileTest.java | 2 +- .../classic/turbo/ReconfigureOnChangeTest.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.