From 22031d7e531985e9e94d694e74fb00da99de72a5 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sat, 7 Apr 2018 15:21:05 +0200
Subject: tests: matrix: check for fd leaks

And fix two in test_helpers.Mount().

Leftover fds can cause an unmount failure like this later:
fusermount: failed to unmount /tmp/gocryptfs-test-parent/873632270/default-plain: Device or resource busy
so try to catch them early.
---
 tests/test_helpers/helpers.go | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'tests/test_helpers/helpers.go')

diff --git a/tests/test_helpers/helpers.go b/tests/test_helpers/helpers.go
index f92fb79..971948c 100644
--- a/tests/test_helpers/helpers.go
+++ b/tests/test_helpers/helpers.go
@@ -178,9 +178,14 @@ func Mount(c string, p string, showOutput bool, extraArgs ...string) error {
 		if err != nil {
 			return err
 		}
+		// We can close the fd after cmd.Run() has executed
+		defer pw.Close()
 		cmd.Stderr = pw
 		cmd.Stdout = pw
-		go func() { io.Copy(os.Stdout, pr) }()
+		go func() {
+			io.Copy(os.Stdout, pr)
+			pr.Close()
+		}()
 	}
 
 	return cmd.Run()
@@ -412,3 +417,23 @@ func ExtractCmdExitCode(err error) int {
 	code := err2.Sys().(syscall.WaitStatus).ExitStatus()
 	return code
 }
+
+// ListFds lists our open file descriptors.
+// We use /dev/fd because it exists on both Linux and MacOS.
+func ListFds() []string {
+	f, err := os.Open("/dev/fd")
+	if err != nil {
+		log.Panic(err)
+	}
+	defer f.Close()
+	names, err := f.Readdirnames(0)
+	if err != nil {
+		log.Panic(err)
+	}
+	for i, n := range names {
+		// Note: Readdirnames filters "." and ".."
+		target, _ := os.Readlink("/dev/fd/" + n)
+		names[i] = n + "=" + target
+	}
+	return names
+}
-- 
cgit v1.2.3