aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Unterwurzacher2019-10-06 18:48:09 +0200
committerJakob Unterwurzacher2019-10-06 18:48:09 +0200
commitd361f6e35bb97ef8f060131ea5b29f922e613c49 (patch)
tree6fc1d74db71a03dfca9f3569e4a027320b596196
parent44e5c9ab967fcab61620e6635ab2194b254dfa67 (diff)
tests: clarify which process seems to be leaking fds
The tests check if they leak fds themselves, but we also check if gocryptfs leaks fds. Clarify what is what in the error message.
-rw-r--r--tests/cli/cli_test.go2
-rw-r--r--tests/matrix/matrix_test.go2
-rw-r--r--tests/test_helpers/mount_unmount.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/cli/cli_test.go b/tests/cli/cli_test.go
index 0461d3c..d0ac5d8 100644
--- a/tests/cli/cli_test.go
+++ b/tests/cli/cli_test.go
@@ -26,7 +26,7 @@ func TestMain(m *testing.M) {
r := m.Run()
after := test_helpers.ListFds(0)
if len(before) != len(after) {
- fmt.Printf("fd leak? before, after:\n%v\n%v\n", before, after)
+ fmt.Printf("fd leak in test process? before, after:\n%v\n%v\n", before, after)
os.Exit(1)
}
os.Exit(r)
diff --git a/tests/matrix/matrix_test.go b/tests/matrix/matrix_test.go
index 7bfb372..e4424a7 100644
--- a/tests/matrix/matrix_test.go
+++ b/tests/matrix/matrix_test.go
@@ -83,7 +83,7 @@ func TestMain(m *testing.M) {
// the gocryptfs FUSE process, but only in the tests that access it!
after := test_helpers.ListFds(0)
if len(before) != len(after) {
- fmt.Printf("fd leak? before, after:\n%v\n%v\n", before, after)
+ fmt.Printf("fd leak in test process? before, after:\n%v\n%v\n", before, after)
os.Exit(1)
}
test_helpers.UnmountPanic(test_helpers.DefaultPlainDir)
diff --git a/tests/test_helpers/mount_unmount.go b/tests/test_helpers/mount_unmount.go
index 6a2b908..453ea20 100644
--- a/tests/test_helpers/mount_unmount.go
+++ b/tests/test_helpers/mount_unmount.go
@@ -175,7 +175,7 @@ func UnmountErr(dir string) (err error) {
err = cmd.Run()
if err == nil {
if len(fdsNow) > len(fds)+maxCacheFds {
- return fmt.Errorf("FD leak? pid=%d dir=%q, fds:\nold=%v \nnew=%v\n", pid, dir, fds, fdsNow)
+ return fmt.Errorf("fd leak in gocryptfs process? pid=%d dir=%q, fds:\nold=%v \nnew=%v\n", pid, dir, fds, fdsNow)
}
return nil
}