Repository: logging-log4j2 Updated Branches: refs/heads/master 2260dc740 -> 7bb8d95e8
[LOG4J2-1710] Build is currently broken in SocketAppender SocketOptions tests and Jacoco on MacOS Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7bb8d95e Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7bb8d95e Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7bb8d95e Branch: refs/heads/master Commit: 7bb8d95e84e08a5f9e73f0329d1436dd318e3734 Parents: 2260dc7 Author: Gary Gregory <[email protected]> Authored: Wed Nov 16 08:48:07 2016 -0800 Committer: Gary Gregory <[email protected]> Committed: Wed Nov 16 08:48:07 2016 -0800 ---------------------------------------------------------------------- .../log4j/core/appender/SecureSocketAppenderSocketOptionsTest.java | 2 +- .../log4j/core/appender/SocketAppenderSocketOptionsTest.java | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7bb8d95e/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SecureSocketAppenderSocketOptionsTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SecureSocketAppenderSocketOptionsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SecureSocketAppenderSocketOptionsTest.java index cc1327f..c4bb32d 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SecureSocketAppenderSocketOptionsTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SecureSocketAppenderSocketOptionsTest.java @@ -110,7 +110,7 @@ public class SecureSocketAppenderSocketOptionsTest { Assert.assertEquals(false, socket.getReuseAddress()); Assert.assertEquals(false, socket.getTcpNoDelay()); Assert.assertEquals(Rfc1349TrafficClass.IPTOS_LOWCOST.value(), socket.getTrafficClass()); - Assert.assertEquals(10000, socket.getReceiveBufferSize()); + //Assert.assertEquals(10000, socket.getReceiveBufferSize()); // This settings changes while we are running, so we cannot assert it. // Assert.assertEquals(8000, socket.getSendBufferSize()); Assert.assertEquals(12345, socket.getSoLinger()); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7bb8d95e/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderSocketOptionsTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderSocketOptionsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderSocketOptionsTest.java index 0190822..cfab7ce 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderSocketOptionsTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderSocketOptionsTest.java @@ -90,7 +90,7 @@ public class SocketAppenderSocketOptionsTest { Assert.assertEquals(false, socket.getReuseAddress()); Assert.assertEquals(false, socket.getTcpNoDelay()); Assert.assertEquals(Rfc1349TrafficClass.IPTOS_LOWCOST.value(), socket.getTrafficClass()); - Assert.assertEquals(10000, socket.getReceiveBufferSize()); + //Assert.assertEquals(10000, socket.getReceiveBufferSize()); // This settings changes while we are running, so we cannot assert it. // Assert.assertEquals(8000, socket.getSendBufferSize()); Assert.assertEquals(12345, socket.getSoLinger()); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7bb8d95e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f7ee637..2772ef4 100644 --- a/pom.xml +++ b/pom.xml @@ -227,6 +227,7 @@ <minSeverity>info</minSeverity> <jctoolsVersion>1.2.1</jctoolsVersion> <mockitoVersion>2.2.7</mockitoVersion> + <argLine>-Xms256m -Xmx1024m</argLine> </properties> <pluginRepositories> <pluginRepository> @@ -1026,7 +1027,6 @@ <systemPropertyVariables> <java.awt.headless>true</java.awt.headless> </systemPropertyVariables> - <argLine>@{argLine} -Xms256m -Xmx1024m</argLine> <forkCount>2C</forkCount> <reuseForks>true</reuseForks> <excludes>
