summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDean Deng <deandeng@google.com>2020-06-01 13:28:49 -0700
committergVisor bot <gvisor-bot@google.com>2020-06-01 13:30:39 -0700
commit07c3b1dc5561f8ceb376cba1d79a41cd4b7a2533 (patch)
treef3cc1c1a2b5663fe5fe4c471269067f9c869ea4e
parent288a1ca6f09cc6213713d00dca0d18600d2e857c (diff)
Skip proc/pid/fd socket test for VFS1 only.
PiperOrigin-RevId: 314192359
-rw-r--r--test/syscalls/linux/socket_unix.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/test/syscalls/linux/socket_unix.cc b/test/syscalls/linux/socket_unix.cc
index 8bf663e8b..591cab3fd 100644
--- a/test/syscalls/linux/socket_unix.cc
+++ b/test/syscalls/linux/socket_unix.cc
@@ -256,10 +256,9 @@ TEST_P(UnixSocketPairTest, ShutdownWrite) {
}
TEST_P(UnixSocketPairTest, SocketReopenFromProcfs) {
- // TODO(b/122310852): We should be returning ENXIO and NOT EIO.
- // TODO(github.dev/issue/1624): This should be resolved in VFS2. Verify
- // that this is the case and delete the SKIP_IF once we delete VFS1.
- SKIP_IF(IsRunningOnGvisor());
+ // TODO(gvisor.dev/issue/1624): In VFS1, we return EIO instead of ENXIO (see
+ // b/122310852). Remove this skip once VFS1 is deleted.
+ SKIP_IF(IsRunningWithVFS1());
auto sockets = ASSERT_NO_ERRNO_AND_VALUE(NewSocketPair());
// Opening a socket pair via /proc/self/fd/X is a ENXIO.