diff --git a/pom.xml b/pom.xml index fd67ed04730..3c01cc73783 100644 --- a/pom.xml +++ b/pom.xml @@ -759,20 +759,6 @@ true false - - - io.netty - netty-transport-native-epoll - true - linux-x86_64 - - - io.netty - netty-transport-native-kqueue - true - osx-x86_64 - - @@ -782,20 +768,6 @@ true true - - - io.netty - netty-transport-native-epoll - true - linux-x86_64 - - - io.netty - netty-transport-native-kqueue - true - osx-x86_64 - - @@ -873,10 +845,28 @@ - mac + linux + + + linux + + + + + io.netty + netty-transport-native-epoll + linux-x86_64 + test + + + + + + osx-x86_64 mac + x86_64 @@ -886,6 +876,36 @@ osx-x86_64 test + + io.netty + netty-transport-native-kqueue + osx-x86_64 + test + + + + + + osx-aarch64 + + + mac + aarch64 + + + + + io.netty + netty-resolver-dns-native-macos + osx-aarch_64 + test + + + io.netty + netty-transport-native-kqueue + osx-aarch_64 + test + diff --git a/src/test/java/io/vertx/core/http/HttpTest.java b/src/test/java/io/vertx/core/http/HttpTest.java index a92a8fea097..205f383ab9d 100644 --- a/src/test/java/io/vertx/core/http/HttpTest.java +++ b/src/test/java/io/vertx/core/http/HttpTest.java @@ -178,12 +178,13 @@ public void testListenDomainSocketAddress() throws Exception { for (int i = 0;i < len;i++) { File sockFile = TestUtils.tmpFile(".sock"); SocketAddress sockAddress = SocketAddress.domainSocketAddress(sockFile.getAbsolutePath()); - HttpServer server = vertx + HttpServer server = vx .createHttpServer(createBaseServerOptions()) .requestHandler(req -> req.response().end(sockAddress.path())); startServer(sockAddress, server); addresses.add(sockAddress); } + HttpClient client = vx.createHttpClient(createBaseClientOptions()); for (int i = 0;i < len;i++) { SocketAddress sockAddress = addresses.get(i); for (int j = 0;j < len;j++) { diff --git a/src/test/java/io/vertx/core/net/NetTest.java b/src/test/java/io/vertx/core/net/NetTest.java index 8a59ca63817..e4c5b610cf6 100755 --- a/src/test/java/io/vertx/core/net/NetTest.java +++ b/src/test/java/io/vertx/core/net/NetTest.java @@ -1985,7 +1985,7 @@ public void testListenDomainSocketAddress() throws Exception { for (int i = 0;i < len;i++) { File sockFile = TestUtils.tmpFile(".sock"); SocketAddress sockAddress = SocketAddress.domainSocketAddress(sockFile.getAbsolutePath()); - NetServer server = vertx + NetServer server = vx .createNetServer() .connectHandler(so -> { so.end(Buffer.buffer(sockAddress.path())); @@ -1993,6 +1993,7 @@ public void testListenDomainSocketAddress() throws Exception { startServer(sockAddress, server); addresses.add(sockAddress); } + NetClient client = vx.createNetClient(); for (int i = 0;i < len;i++) { for (int j = 0;j < len;j++) { SocketAddress sockAddress = addresses.get(i); diff --git a/src/test/java/io/vertx/test/core/VertxTestBase.java b/src/test/java/io/vertx/test/core/VertxTestBase.java index f88f3883be0..cd004bd0812 100644 --- a/src/test/java/io/vertx/test/core/VertxTestBase.java +++ b/src/test/java/io/vertx/test/core/VertxTestBase.java @@ -19,6 +19,7 @@ import io.vertx.core.spi.tracing.VertxTracer; import io.vertx.core.tracing.TracingOptions; import io.vertx.test.fakecluster.FakeClusterManager; +import junit.framework.AssertionFailedError; import org.junit.Assert; import org.junit.Rule; @@ -64,7 +65,15 @@ public void setUp() throws Exception { VertxOptions options = getOptions(); boolean nativeTransport = options.getPreferNativeTransport(); vertx = vertx(options); - if (nativeTransport) { + if (nativeTransport && !vertx.isNativeTransportEnabled()) { + if (!vertx.isNativeTransportEnabled()) { + AssertionFailedError afe = new AssertionFailedError("Expected native transport"); + Throwable cause = vertx.unavailableNativeTransportCause(); + if (cause != null) { + afe.initCause(cause); + } + throw afe; + } assertTrue(vertx.isNativeTransportEnabled()); } }