(tomcat) 09/18: Don't flag a test as skipped that is never going to be able to pass

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit df5082cb6be4a8d0ca6fcf89eb7618be8e2b6e8e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 3 10:42:01 2024 +0000

    Don't flag a test as skipped that is never going to be able to pass
---
 test/org/apache/tomcat/util/net/TestXxxEndpoint.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java 
b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
index 817df2d8d5..f980423f03 100644
--- a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
+++ b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
@@ -24,7 +24,6 @@ import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;
 
 import org.junit.Assert;
-import org.junit.Assume;
 import org.junit.Test;
 
 import org.apache.catalina.connector.Connector;
@@ -206,9 +205,12 @@ public class TestXxxEndpoint extends TomcatBaseTest {
     public void testUnixDomainSocket() throws Exception {
         Tomcat tomcat = getTomcatInstance();
         Connector c = tomcat.getConnector();
-        Assume.assumeTrue("NIO Unix domain sockets have to be supported for 
this test",
-                c.getProtocolHandlerClassName().contains("NioProtocol")
-                && JreCompat.isJre16Available());
+
+        if (!c.getProtocolHandlerClassName().contains("NioProtocol") || 
!JreCompat.isJre16Available()) {
+            // Only the NIO connector supports UnixDomainSockets
+            // and only when running on Java 16+
+            return;
+        }
 
         File tempPath = File.createTempFile("uds-tomcat-test-", ".sock");
         String unixDomainSocketPath = tempPath.getAbsolutePath();


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org