Branch: refs/heads/master Home: https://github.com/qos-ch/logback Commit: bec02c08a22660104c3f7dcdac7b56749393ae28 https://github.com/qos-ch/logback/commit/bec02c08a22660104c3f7dcdac7b5674939... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-16 (Tue, 16 Apr 2013) Changed paths: M logback-core/src/test/java/ch/qos/logback/core/net/SocketConnectorBaseTest.java Log Message: ----------- reduce timing sensitivity in SocketConnectorBaseTest testConnectionFails was expecting the connector thread to exit after being interrupted, with latency no greater than the configured delay between connection attempts. However, the call to SocketFactory.createSocket may not return immediately on interrupt. Now, we allow 4 * DELAY for the thread to exit. This commit should allow more than enough tolerance, but (as it generally has no effect on the run duration of the test) we could increase the allowed delay even further if it proves too sensitive to timing variations on the build system. Commit: 859256759ad2564dea1f1408af75716015ebc26b https://github.com/qos-ch/logback/commit/859256759ad2564dea1f1408af75716015e... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-16 (Tue, 16 Apr 2013) Changed paths: M logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java M logback-core/src/test/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP_Test.java M logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java M logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemoval_Test.java Log Message: ----------- Merge branch 'master' of git@github.com:qos-ch/logback.git Compare: https://github.com/qos-ch/logback/compare/56e8ab219269...859256759ad2