Move detach flags to platform specific

Signed-off-by: Derek McGowan <derek@mcgstyle.net>

snapshot/testsuite/helpers_linux.go

@@ -0,0 +1,5 @@
+package testsuite
+
+import "golang.org/x/sys/unix"
+
+const umountflags int = unix.MNT_DETACH

snapshot/testsuite/helpers_other.go

@@ -0,0 +1,5 @@
+// +build !linux
+
+package testsuite
+
+const umountflags int = 0

snapshot/testsuite/testsuite_unix.go

@@ -2,13 +2,7 @@
 
 package testsuite
 
-import (
+import "syscall"
-	"syscall"
-
-	"golang.org/x/sys/unix"
-)
-
-const umountflags int = unix.MNT_DETACH
 
 func clearMask() func() {
 	oldumask := syscall.Umask(0)

snapshot/testsuite/testsuite_windows.go

@@ -1,7 +1,5 @@
 package testsuite
 
-const umountflags int = 0
-
 func clearMask() func() {
 	return func() {}
 }

testutil/helpers_unix.go

@@ -9,13 +9,12 @@ import (
 
 	"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 {
+	if err := mount.UnmountAll(mountPoint, umountflags); err != nil {
 		t.Error("Could not umount", mountPoint, err)
 	}
 }

testutil/mount_linux.go

@@ -0,0 +1,5 @@
+package testutil
+
+import "golang.org/x/sys/unix"
+
+const umountflags int = unix.MNT_DETACH

testutil/mount_other.go

@@ -0,0 +1,5 @@
+// +build !linux
+
+package testutil
+
+const umountflags int = 0