Unify testutil.Unmount on Windows and Unix

TBBle · gabriel-samfira · commit b57424851cc5 · 2023-05-31T02:05:35.000+03:00
Signed-off-by: Paul "TBBle" Hampson &lt;Paul.Hampson@Pobox.com&gt;
diff --git a/pkg/testutil/helpers.go b/pkg/testutil/helpers.go
@@ -23,6 +23,9 @@ import (
 	"path/filepath"
 	"strconv"
 	"testing"
+
+	"github.com/containerd/containerd/mount"
+	"github.com/stretchr/testify/assert"
 )
 
 var rootEnabled bool
@@ -79,3 +82,10 @@ func DumpDirOnFailure(t *testing.T, root string) {
 		DumpDir(t, root)
 	}
 }
+
+// Unmount unmounts a given mountPoint and sets t.Error if it fails
+func Unmount(t testing.TB, mountPoint string) {
+	t.Log("unmount", mountPoint)
+	err := mount.UnmountAll(mountPoint, umountflags)
+	assert.NoError(t, err)
+}
diff --git a/pkg/testutil/helpers_unix.go b/pkg/testutil/helpers_unix.go
@@ -23,17 +23,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/containerd/containerd/mount"
 	"github.com/stretchr/testify/assert"
 )
 
-// Unmount unmounts a given mountPoint and sets t.Error if it fails
-func Unmount(t testing.TB, mountPoint string) {
-	t.Log("unmount", mountPoint)
-	err := mount.UnmountAll(mountPoint, umountflags)
-	assert.NoError(t, err)
-}
-
 // RequiresRoot skips tests that require root, unless the test.root flag has
 // been set
 func RequiresRoot(t testing.TB) {
diff --git a/pkg/testutil/helpers_windows.go b/pkg/testutil/helpers_windows.go
@@ -25,8 +25,3 @@ func RequiresRoot(t testing.TB) {
 // RequiresRootM is similar to RequiresRoot but intended to be called from *testing.M.
 func RequiresRootM() {
 }
-
-// Unmount unmounts a given mountPoint and sets t.Error if it fails
-// Does nothing on Windows
-func Unmount(t *testing.T, mountPoint string) {
-}
diff --git a/pkg/testutil/mount_other.go b/pkg/testutil/mount_other.go
@@ -1,4 +1,5 @@
-//go:build !linux && !windows
+//go:build !linux
+// +build !linux
 
 /*
    Copyright The containerd Authors.

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,9 @@ import (`
`23`	`23`	`"path/filepath"`
`24`	`24`	`"strconv"`
`25`	`25`	`"testing"`
	`26`	`+`
	`27`	`+ "github.com/containerd/containerd/mount"`
	`28`	`+ "github.com/stretchr/testify/assert"`
`26`	`29`	`)`
`27`	`30`
`28`	`31`	`var rootEnabled bool`
`@@ -79,3 +82,10 @@ func DumpDirOnFailure(t *testing.T, root string) {`
`79`	`82`	`DumpDir(t, root)`
`80`	`83`	`}`
`81`	`84`	`}`
	`85`	`+`
	`86`	`+// Unmount unmounts a given mountPoint and sets t.Error if it fails`
	`87`	`+func Unmount(t testing.TB, mountPoint string) {`
	`88`	`+ t.Log("unmount", mountPoint)`
	`89`	`+ err := mount.UnmountAll(mountPoint, umountflags)`
	`90`	`+ assert.NoError(t, err)`
	`91`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,3 @@ func RequiresRoot(t testing.TB) {`
`25`	`25`	`// RequiresRootM is similar to RequiresRoot but intended to be called from *testing.M.`
`26`	`26`	`func RequiresRootM() {`
`27`	`27`	`}`
`28`		`-`
`29`		`-// Unmount unmounts a given mountPoint and sets t.Error if it fails`
`30`		`-// Does nothing on Windows`
`31`		`-func Unmount(t *testing.T, mountPoint string) {`
`32`		`-}`