From 01e75f5d9719ef7a81429aec400e5984c0e94adc Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Wed, 10 May 2023 15:36:22 +0200 Subject: [PATCH] HA unknown protocol cannot pass anymore for domain sockets --- pom.xml | 1 + src/test/java/io/vertx/core/http/HttpTest.java | 2 ++ src/test/java/io/vertx/core/net/NetTest.java | 3 +++ 3 files changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index aa930947640..3944c062251 100644 --- a/pom.xml +++ b/pom.xml @@ -120,6 +120,7 @@ io.netty netty-transport-native-kqueue true + osx-aarch_64 diff --git a/src/test/java/io/vertx/core/http/HttpTest.java b/src/test/java/io/vertx/core/http/HttpTest.java index 86e6e789775..d56a1efc461 100644 --- a/src/test/java/io/vertx/core/http/HttpTest.java +++ b/src/test/java/io/vertx/core/http/HttpTest.java @@ -6378,6 +6378,7 @@ public void testHAProxyProtocolVersion1TCP6() throws Exception { @Test public void testHAProxyProtocolVersion1Unknown() throws Exception { + Assume.assumeTrue(testAddress.isInetSocket()); Buffer header = HAProxy.createVersion1UnknownProtocolHeader(); testHAProxyProtocolAccepted(header, null, testAddress); } @@ -6408,6 +6409,7 @@ public void testHAProxyProtocolVersion2UnixSocket() throws Exception { @Test public void testHAProxyProtocolVersion2Unknown() throws Exception { + Assume.assumeTrue(testAddress.isInetSocket()); Buffer header = HAProxy.createVersion2UnknownProtocolHeader(); testHAProxyProtocolAccepted(header, null, testAddress); } diff --git a/src/test/java/io/vertx/core/net/NetTest.java b/src/test/java/io/vertx/core/net/NetTest.java index ce78cca2ffd..db17bdf00ab 100755 --- a/src/test/java/io/vertx/core/net/NetTest.java +++ b/src/test/java/io/vertx/core/net/NetTest.java @@ -4206,6 +4206,7 @@ public void testHAProxyProtocolIdleTimeoutNotHappened() throws Exception { @Test public void testHAProxyProtocolConnectSSL() throws Exception { + Assume.assumeTrue(testAddress.isInetSocket()); waitFor(2); SocketAddress remote = SocketAddress.inetSocketAddress(56324, "192.168.0.1"); SocketAddress local = SocketAddress.inetSocketAddress(443, "192.168.0.11"); @@ -4267,6 +4268,7 @@ public void testHAProxyProtocolVersion1TCP6() throws Exception { @Test public void testHAProxyProtocolVersion1Unknown() throws Exception { + Assume.assumeTrue(testAddress.isInetSocket()); Buffer header = HAProxy.createVersion1UnknownProtocolHeader(); testHAProxyProtocolAccepted(header, null, testAddress); } @@ -4297,6 +4299,7 @@ public void testHAProxyProtocolVersion2UnixSocket() throws Exception { @Test public void testHAProxyProtocolVersion2Unknown() throws Exception { + Assume.assumeTrue(testAddress.isInetSocket()); Buffer header = HAProxy.createVersion2UnknownProtocolHeader(); testHAProxyProtocolAccepted(header, null, testAddress); }