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 a11c40845b39152164339eba89579eab30c3d7e2 (commit) from 9df24380d7a814b6db372781c520a1a9bf29b15b (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=a11c40845b39152164339eba8... http://github.com/ceki/logback/commit/a11c40845b39152164339eba89579eab30c3d7... commit a11c40845b39152164339eba89579eab30c3d7e2 Author: Ceki Gulcu <ceki@qos.ch> Date: Wed Oct 26 09:02:30 2011 +0200 taking into account that a reset can occur while the harness thread is sleeping 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 b63a079..1c2acb0 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 @@ -261,7 +261,10 @@ public class ReconfigureOnChangeTest { String failMsg = "effective=" + effectiveResets + ", expected=" + expected; - assertEquals(failMsg, expected, effectiveResets); + + // there might be more effective resets than the expected amount + // since the harness may be sleeping while a reset occurs + assertTrue(failMsg, expected <= effectiveResets && (expected +2) >= effectiveResets); } diff --git a/logback-core/src/test/java/ch/qos/logback/core/contention/WaitOnExecutionMultiThreadedHarness.java b/logback-core/src/test/java/ch/qos/logback/core/contention/WaitOnExecutionMultiThreadedHarness.java index 0854e7a..24a4a30 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/contention/WaitOnExecutionMultiThreadedHarness.java +++ b/logback-core/src/test/java/ch/qos/logback/core/contention/WaitOnExecutionMultiThreadedHarness.java @@ -13,8 +13,8 @@ public class WaitOnExecutionMultiThreadedHarness extends AbstractMultiThreadedHa } @Override void waitUntilEndCondition() throws InterruptedException { - while(threadPoolExecutor.getCompletedTaskCount() != count) { - Thread.sleep(100); + while(threadPoolExecutor.getCompletedTaskCount() < count) { + Thread.sleep(20); } } } ----------------------------------------------------------------------- Summary of changes: .../classic/turbo/ReconfigureOnChangeTest.java | 5 ++++- .../WaitOnExecutionMultiThreadedHarness.java | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.