From c8fa685cb6b562e4d8fc05c7d01968e4e12234aa Mon Sep 17 00:00:00 2001 From: Rahat Mahmood Date: Mon, 27 Jul 2020 13:19:25 -0700 Subject: Fix when FUSE tests need to be skipped due to sentry configuration. PiperOrigin-RevId: 323426851 --- test/syscalls/linux/mount.cc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/test/syscalls/linux/mount.cc b/test/syscalls/linux/mount.cc index 7664fa73d..97e8d0f7e 100644 --- a/test/syscalls/linux/mount.cc +++ b/test/syscalls/linux/mount.cc @@ -323,10 +323,7 @@ TEST(MountTest, RenameRemoveMountPoint) { TEST(MountTest, MountFuseFilesystemNoDevice) { SKIP_IF(!ASSERT_NO_ERRNO_AND_VALUE(HaveCapability(CAP_SYS_ADMIN))); - - // Note(gvisor.dev/issue/3076) This won't work in the sentry until the new - // device registration is complete. - SKIP_IF(IsRunningWithVFS1() || IsRunningOnGvisor()); + SKIP_IF(IsRunningOnGvisor() && !IsFUSEEnabled()); auto const dir = ASSERT_NO_ERRNO_AND_VALUE(TempPath::CreateDir()); EXPECT_THAT(mount("", dir.path().c_str(), "fuse", 0, ""), @@ -335,10 +332,7 @@ TEST(MountTest, MountFuseFilesystemNoDevice) { TEST(MountTest, MountFuseFilesystem) { SKIP_IF(!ASSERT_NO_ERRNO_AND_VALUE(HaveCapability(CAP_SYS_ADMIN))); - - // Note(gvisor.dev/issue/3076) This won't work in the sentry until the new - // device registration is complete. - SKIP_IF(IsRunningWithVFS1() || IsRunningOnGvisor()); + SKIP_IF(IsRunningOnGvisor() && !IsFUSEEnabled()); const FileDescriptor fd = ASSERT_NO_ERRNO_AND_VALUE(Open("/dev/fuse", O_WRONLY)); -- cgit v1.2.3