Skip to content

mountinfo: TestMountedBy: skip mountedByOpenat2() check if not supported #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AkihiroSuda merged 1 commit into from
Sep 21, 2021
Merged

mountinfo: TestMountedBy: skip mountedByOpenat2() check if not supported #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions mountinfo/mounted_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,22 +179,27 @@ func requireOpenat2(t *testing.T) {
if os.Getuid() != 0 {
t.Skip("requires root")
}
fd, err := unix.Openat2(unix.AT_FDCWD, ".", &unix.OpenHow{Flags: unix.O_RDONLY})
if err != nil {
if err := tryOpenat2(); err != nil {
t.Skipf("openat2: %v (old kernel? need Linux 5.6+)", err)
}
unix.Close(fd)
}

func TestMountedBy(t *testing.T) {
requireOpenat2(t)
func tryOpenat2() error {
fd, err := unix.Openat2(unix.AT_FDCWD, ".", &unix.OpenHow{Flags: unix.O_RDONLY})
if err == nil {
_ = unix.Close(fd)
}
return err
}

func TestMountedBy(t *testing.T) {
dir, mounts, err := prepareMounts(t)
defer cleanupMounts(t, dir, mounts)
if err != nil {
t.Fatalf("setup failed: %v", err)
}

openat2Supported := tryOpenat2() == nil
checked := false
for _, m := range mounts {
exp := !strings.Contains(m, notMounted)
Expand All @@ -207,11 +212,14 @@ func TestMountedBy(t *testing.T) {
}

checked = true
mounted, err = mountedByOpenat2(m)
if err != nil {
t.Errorf("mountedByOpenat2(%q) error: %v", m, err)
} else if mounted != exp {
t.Errorf("mountedByOpenat2(%q): expected %v, got %v", m, exp, mounted)

if openat2Supported {
mounted, err = mountedByOpenat2(m)
if err != nil {
t.Errorf("mountedByOpenat2(%q) error: %v", m, err)
} else if mounted != exp {
t.Errorf("mountedByOpenat2(%q): expected %v, got %v", m, exp, mounted)
}
}

mounted, err = mountedByStat(m)
Expand Down