diff options
author | Jakob Unterwurzacher | 2018-03-05 21:56:30 +0100 |
---|---|---|
committer | Jakob Unterwurzacher | 2018-03-05 22:00:59 +0100 |
commit | 3064d72b9774029ab89daea8a7fccfe181c3cae0 (patch) | |
tree | 288ba273f99c980a8c512cda438efe7a3c2bd694 /tests/defaults | |
parent | 6c172dcb02c32b9ed3b21e89367fd9826a880bc9 (diff) |
tests: fix a few fd leaks
We relied on the finalizer to close a few fds.
For some reason, this did not cause problems on Linux,
but on MacOS, it causes unmount failures:
umount(/private/tmp/gocryptfs-test-parent/194654785/default-plain): Resource busy -- try 'diskutil unmount'
Diffstat (limited to 'tests/defaults')
-rw-r--r-- | tests/defaults/diriv_test.go | 2 | ||||
-rw-r--r-- | tests/defaults/main_test.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/defaults/diriv_test.go b/tests/defaults/diriv_test.go index 75f1511..9aba1f2 100644 --- a/tests/defaults/diriv_test.go +++ b/tests/defaults/diriv_test.go @@ -45,7 +45,7 @@ func TestDirIVRace(t *testing.T) { for { // Keep dir2 in the diriv cache fd, err2 := os.Open(file2) - if err2 != nil { + if err2 == nil { fd.Close() } if stop { diff --git a/tests/defaults/main_test.go b/tests/defaults/main_test.go index 5c6bb84..49c6dcf 100644 --- a/tests/defaults/main_test.go +++ b/tests/defaults/main_test.go @@ -51,6 +51,7 @@ func TestOpenTruncateRead(t *testing.T) { if err != nil { t.Fatal(err) } + defer writeFd.Close() abc := []byte("abc") _, err = writeFd.WriteAt(abc, 0) if err != nil { @@ -61,6 +62,7 @@ func TestOpenTruncateRead(t *testing.T) { if err != nil { t.Fatal(err) } + defer readFd.Close() content := make([]byte, 3) _, err = readFd.ReadAt(content, 0) if err != nil { |