You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2021/12/23 10:20:10 UTC
[logging-log4j2] branch release-2.x updated: Refactor timeouts in SocketAppenderReconnectTest.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new 2320eef Refactor timeouts in SocketAppenderReconnectTest.
2320eef is described below
commit 2320eef8118c9b397e0cba37216ce468220ddb5d
Author: Volkan Yazici <vo...@yazi.ci>
AuthorDate: Thu Dec 23 11:19:54 2021 +0100
Refactor timeouts in SocketAppenderReconnectTest.
---
.../log4j/core/net/SocketAppenderReconnectTest.java | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketAppenderReconnectTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketAppenderReconnectTest.java
index 052c34d..5fa603f 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketAppenderReconnectTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketAppenderReconnectTest.java
@@ -28,7 +28,6 @@ import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilderFact
import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
import org.apache.logging.log4j.core.net.TcpSocketManager.HostResolver;
import org.apache.logging.log4j.status.StatusLogger;
-import org.apache.logging.log4j.util.PropertiesUtil;
import org.junit.jupiter.api.Test;
import java.io.BufferedReader;
@@ -200,19 +199,9 @@ class SocketAppenderReconnectTest {
}
private static void awaitUntilSucceeds(final Runnable runnable) {
- final long pollIntervalMillis;
- final long timeoutSeconds;
- final boolean osWindows = PropertiesUtil.getProperties().isOsWindows();
- if (osWindows) {
- // Windows-specific non-sense values.
- // These figures are collected by trial-and-error on a friend's laptop which has Windows installed.
- pollIntervalMillis = 1_000L;
- timeoutSeconds = 15;
- } else {
- // Universally sensible values.
- pollIntervalMillis = 1000;
- timeoutSeconds = 3;
- }
+ // These figures are collected via trial-and-error; nothing scientific to look for here.
+ final long pollIntervalMillis = 1_000L;
+ final long timeoutSeconds = 15L;
await()
.pollInterval(pollIntervalMillis, TimeUnit.MILLISECONDS)
.atMost(timeoutSeconds, TimeUnit.SECONDS)