summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJakob Unterwurzacher2019-01-14 22:11:15 +0100
committerJakob Unterwurzacher2019-01-14 22:11:15 +0100
commit20140e24ed339ef97b4f3946da3b05f930898713 (patch)
treec7c6059036396208e0aebd94b3320a39f4f497b1 /tests
parent6542ddd2f9416e73f4ba18d9451601ea35af7ff3 (diff)
tests: reduce noise on MacOS
This should get rid of Openat: O_NOFOLLOW missing: flags = 0x0 Fchmodat: adding missing AT_SYMLINK_NOFOLLOW flag sys_common_test.go:203: chmod on symlink should have failed, but did not. New mode=0333 UnmountErr: "[...]/057376762.mnt" was not found in MountInfo, cannot check for FD leak and add some context to --- FAIL: TestUtimesNano (0.00s) matrix_test.go:628: no such file or directory See https://github.com/rfjakob/gocryptfs/pull/343#issuecomment-453888006 for full test output
Diffstat (limited to 'tests')
-rw-r--r--tests/matrix/matrix_test.go2
-rw-r--r--tests/test_helpers/mount_unmount.go3
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/matrix/matrix_test.go b/tests/matrix/matrix_test.go
index ad2eeae..e4c6b5f 100644
--- a/tests/matrix/matrix_test.go
+++ b/tests/matrix/matrix_test.go
@@ -625,7 +625,7 @@ func doTestUtimesNano(t *testing.T, path string) {
for i, tc := range utimeTestcases {
err := syscall.UtimesNano(path, tc.in[:])
if err != nil {
- t.Fatal(err)
+ t.Fatalf("%q: %v", path, err)
}
var st syscall.Stat_t
err = syscall.Stat(path, &st)
diff --git a/tests/test_helpers/mount_unmount.go b/tests/test_helpers/mount_unmount.go
index 1d43418..20b1143 100644
--- a/tests/test_helpers/mount_unmount.go
+++ b/tests/test_helpers/mount_unmount.go
@@ -133,7 +133,8 @@ func UnmountErr(dir string) (err error) {
var fdsNow []string
pid := MountInfo[dir].Pid
fds := MountInfo[dir].Fds
- if pid <= 0 {
+ if pid <= 0 && runtime.GOOS == "linux" {
+ // The FD leak check only works on Linux.
fmt.Printf("UnmountErr: %q was not found in MountInfo, cannot check for FD leaks\n", dir)
}