test: vsock: Suppress timeout exceptions seen on unconfigured systems

Seen on S390x Linux emulation.
kohlschutter · Feb 14, 2024 · dbd9019 · dbd9019
1 parent ed0488b
commit dbd9019
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 0 deletions.
diff --git a/junixsocket-vsock/src/test/java/org/newsclub/net/unix/vsock/CancelAcceptTest.java b/junixsocket-vsock/src/test/java/org/newsclub/net/unix/vsock/CancelAcceptTest.java
@@ -17,11 +17,16 @@
  */
 package org.newsclub.net.unix.vsock;
 
+import java.net.SocketTimeoutException;
+
+import org.junit.jupiter.api.Test;
 import org.newsclub.net.unix.AFSocketCapability;
 import org.newsclub.net.unix.AFSocketCapabilityRequirement;
 import org.newsclub.net.unix.AFVSOCKSocketAddress;
 
 import com.kohlschutter.annotations.compiletime.SuppressFBWarnings;
+import com.kohlschutter.testutil.TestAbortedWithImportantMessageException;
+import com.kohlschutter.testutil.TestAbortedWithImportantMessageException.MessageType;
 
 @AFSocketCapabilityRequirement(AFSocketCapability.CAPABILITY_VSOCK)
 @SuppressFBWarnings("NM_SAME_SIMPLE_NAME_AS_SUPERCLASS")
@@ -31,4 +36,17 @@ public final class CancelAcceptTest extends
   public CancelAcceptTest() {
     super(AFVSOCKAddressSpecifics.INSTANCE);
   }
+
+  @Test
+  @Override
+  public void issue6test1() throws Exception {
+    try {
+      super.issue6test1();
+    } catch (SocketTimeoutException e) {
+      throw new TestAbortedWithImportantMessageException(
+          MessageType.TEST_ABORTED_SHORT_INFORMATIONAL,
+          "Environment may not be configured for VSOCK. More information at https://kohlschutter.github.io/junixsocket/junixsocket-vsock/",
+          e);
+    }
+  }
 }
diff --git a/junixsocket-vsock/src/test/java/org/newsclub/net/unix/vsock/TcpNoDelayTest.java b/junixsocket-vsock/src/test/java/org/newsclub/net/unix/vsock/TcpNoDelayTest.java
@@ -17,11 +17,16 @@
  */
 package org.newsclub.net.unix.vsock;
 
+import java.net.SocketTimeoutException;
+
+import org.junit.jupiter.api.Test;
 import org.newsclub.net.unix.AFSocketCapability;
 import org.newsclub.net.unix.AFSocketCapabilityRequirement;
 import org.newsclub.net.unix.AFVSOCKSocketAddress;
 
 import com.kohlschutter.annotations.compiletime.SuppressFBWarnings;
+import com.kohlschutter.testutil.TestAbortedWithImportantMessageException;
+import com.kohlschutter.testutil.TestAbortedWithImportantMessageException.MessageType;
 
 @AFSocketCapabilityRequirement(AFSocketCapability.CAPABILITY_VSOCK)
 @SuppressFBWarnings("NM_SAME_SIMPLE_NAME_AS_SUPERCLASS")
@@ -31,4 +36,30 @@ public final class TcpNoDelayTest extends
   public TcpNoDelayTest() {
     super(AFVSOCKAddressSpecifics.INSTANCE);
   }
+
+  @Test
+  @Override
+  public void testStrictImpl() throws Exception {
+    try {
+      super.testStrictImpl();
+    } catch (SocketTimeoutException e) {
+      throw new TestAbortedWithImportantMessageException(
+          MessageType.TEST_ABORTED_SHORT_INFORMATIONAL,
+          "Environment may not be configured for VSOCK. More information at https://kohlschutter.github.io/junixsocket/junixsocket-vsock/",
+          e);
+    }
+  }
+
+  @Test
+  @Override
+  public void testDefaultImpl() throws Exception {
+    try {
+      super.testDefaultImpl();
+    } catch (SocketTimeoutException e) {
+      throw new TestAbortedWithImportantMessageException(
+          MessageType.TEST_ABORTED_SHORT_INFORMATIONAL,
+          "Environment may not be configured for VSOCK. More information at https://kohlschutter.github.io/junixsocket/junixsocket-vsock/",
+          e);
+    }
+  }
 }