summaryrefslogtreecommitdiff
path: root/tests/test_helpers
diff options
context:
space:
mode:
authorJakob Unterwurzacher2019-01-01 19:44:41 +0100
committerJakob Unterwurzacher2019-01-01 20:05:38 +0100
commit887d5aa8e74e20b065b9a0c9b6e99dd05815112a (patch)
tree98dea76b27151a407b634fd2e6de055baa982669 /tests/test_helpers
parent817c485bb7dbd890a15aca683d6004437772c659 (diff)
tests: teach ListFds() to check other processes
Diffstat (limited to 'tests/test_helpers')
-rw-r--r--tests/test_helpers/helpers.go21
1 files changed, 16 insertions, 5 deletions
diff --git a/tests/test_helpers/helpers.go b/tests/test_helpers/helpers.go
index aac03a8..22f47b2 100644
--- a/tests/test_helpers/helpers.go
+++ b/tests/test_helpers/helpers.go
@@ -14,6 +14,7 @@ import (
"os/exec"
"os/signal"
"path/filepath"
+ "runtime"
"syscall"
"testing"
"time"
@@ -481,10 +482,20 @@ func ExtractCmdExitCode(err error) int {
return 0
}
-// 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")
+// ListFds lists the open file descriptors for process "pid". Pass pid=0 for
+// ourselves.
+func ListFds(pid int) []string {
+ // We need /proc to get the list of fds for other processes. Only exists
+ // on Linux.
+ if runtime.GOOS != "linux" && pid > 0 {
+ return nil
+ }
+ // Both Linux and MacOS have /dev/fd
+ dir := "/dev/fd"
+ if pid > 0 {
+ dir = fmt.Sprintf("/proc/%d/fd", pid)
+ }
+ f, err := os.Open(dir)
if err != nil {
log.Panic(err)
}
@@ -495,7 +506,7 @@ func ListFds() []string {
}
for i, n := range names {
// Note: Readdirnames filters "." and ".."
- target, _ := os.Readlink("/dev/fd/" + n)
+ target, _ := os.Readlink(dir + "/" + n)
names[i] = n + "=" + target
}
return names