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

tests: retry longer when we see a fd leak

Browse Source 
Hopefully gets rid of the false positives on travis.
This commit is contained in:
Jakob Unterwurzacher 2019-01-02 21:03:26 +01:00
parent acccfa60d6
commit 59f1300591
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/test_helpers/mount_unmount.go
View File

@ -140,13 +140,17 @@ func UnmountErr(dir string) (err error) {
// Retry a few times to hide that problem. // Retry a few times to hide that problem.
for i := 1; i <= max; i++ { for i := 1; i <= max; i++ {
if pid > 0 { if pid > 0 {
fdsNow = ListFds(pid) for j := 1; j <= max; j++ {
if len(fdsNow) > len(fds) {
// File close on FUSE is asynchronous, closing a socket // File close on FUSE is asynchronous, closing a socket
// when testing -ctlsock as well. Wait one extra millisecond // when testing "-ctlsock" is as well. Wait a little and
// and hope that all close commands get through to the gocryptfs // hope that all close commands get through to the gocryptfs
// process. // process.
time.Sleep(1 * time.Millisecond) fdsNow = ListFds(pid)
if len(fdsNow) <= len(fds) {
break
}
fmt.Printf("UnmountErr: fdsOld=%d fdsNow=%d, retrying\n", len(fds), len(fdsNow))
time.Sleep(10 * time.Millisecond)
fdsNow = ListFds(pid) fdsNow = ListFds(pid)
} }
} }