hardcoresushi/libgocryptfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

tests: drop "-z" from fusermount to catch forgotten fds

Browse Source 
macos does not have lazy unmount, so let's not use it
on linux either.
If the unmount fails, run "lsof" to find the open file.

Also fix the first bug we found this way.
This commit is contained in:
Jakob Unterwurzacher 2018-03-06 21:22:01 +01:00
parent 4732e33a9a
commit 98f735ff6e
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/matrix/matrix_test.go
View File

@ -796,6 +796,7 @@ func TestUtimesNanoFd(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer f.Close()
procPath := fmt.Sprintf("/proc/self/fd/%d", f.Fd()) procPath := fmt.Sprintf("/proc/self/fd/%d", f.Fd())
doTestUtimesNano(t, procPath) doTestUtimesNano(t, procPath)
} }

10
tests/test_helpers/helpers.go
View File

@ -195,14 +195,18 @@ func MountOrFatal(t *testing.T, c string, p string, extraArgs ...string) {
func UnmountPanic(dir string) { func UnmountPanic(dir string) {
err := UnmountErr(dir) err := UnmountErr(dir)
if err != nil { if err != nil {
fmt.Println(err) fmt.Printf("UnmountPanic: %v. Running lsof %s\n", err, dir)
panic(err) cmd := exec.Command("lsof", dir)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
cmd.Run()
panic("UnmountPanic: unmount failed: " + err.Error())
} }
} }
// UnmountErr tries to unmount "dir" and returns the resulting error. // UnmountErr tries to unmount "dir" and returns the resulting error.
func UnmountErr(dir string) error { func UnmountErr(dir string) error {
cmd := exec.Command(UnmountScript, "-u", "-z", dir) cmd := exec.Command(UnmountScript, "-u", dir)
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
return cmd.Run() return cmd.Run()