750771f6d0
The testsuite alters global state by setting the umask, avoid running the testsuite in parallel and move umask manipulation to the test suite level to individual tests may run in parallel. Added better error messaging and handling. Removed reliance on testing object for handling cleanup failure. When a cleanup error occurred, it would fail the test but the log would get skipped. With this change the failure will show up for the running test. Update test unmounting to set the detach flag, avoiding races with btrfs which may see the device as busy when attempting to unmount. Signed-off-by: Derek McGowan <derek@mcgstyle.net>
44 lines
1.0 KiB
Go
44 lines
1.0 KiB
Go
// +build !windows
|
|
|
|
package testutil
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"testing"
|
|
|
|
"github.com/containerd/containerd/mount"
|
|
"github.com/stretchr/testify/assert"
|
|
"golang.org/x/sys/unix"
|
|
)
|
|
|
|
// Unmount unmounts a given mountPoint and sets t.Error if it fails
|
|
func Unmount(t *testing.T, mountPoint string) {
|
|
t.Log("unmount", mountPoint)
|
|
if err := mount.UnmountAll(mountPoint, unix.MNT_DETACH); err != nil {
|
|
t.Error("Could not umount", mountPoint, err)
|
|
}
|
|
}
|
|
|
|
// RequiresRoot skips tests that require root, unless the test.root flag has
|
|
// been set
|
|
func RequiresRoot(t testing.TB) {
|
|
if !rootEnabled {
|
|
t.Skip("skipping test that requires root")
|
|
return
|
|
}
|
|
assert.Equal(t, 0, os.Getuid(), "This test must be run as root.")
|
|
}
|
|
|
|
// RequiresRootM is similar to RequiresRoot but intended to be called from *testing.M.
|
|
func RequiresRootM() {
|
|
if !rootEnabled {
|
|
fmt.Fprintln(os.Stderr, "skipping test that requires root")
|
|
os.Exit(0)
|
|
}
|
|
if 0 != os.Getuid() {
|
|
fmt.Fprintln(os.Stderr, "This test must be run as root.")
|
|
os.Exit(1)
|
|
}
|
|
}
|