mv internal/testutil pkg/testutil

AkihiroSuda · AkihiroSuda · commit d9b9160ae1d2 · 2024-03-04T17:00:39.000+09:00
The package is consumed by several snapshotter plugins

Signed-off-by: Akihiro Suda &lt;akihiro.suda.cz@hco.ntt.co.jp&gt;
diff --git a/core/content/testsuite/testsuite.go b/core/content/testsuite/testsuite.go
@@ -29,7 +29,7 @@ import (
 	"time"
 
 	"github.com/containerd/containerd/v2/core/content"
-	"github.com/containerd/containerd/v2/internal/testutil"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 	"github.com/containerd/errdefs"
 	"github.com/containerd/log/logtest"
 	"github.com/opencontainers/go-digest"
diff --git a/core/metadata/snapshot_test.go b/core/metadata/snapshot_test.go
@@ -30,9 +30,9 @@ import (
 	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/containerd/v2/core/snapshots"
 	"github.com/containerd/containerd/v2/core/snapshots/testsuite"
-	"github.com/containerd/containerd/v2/internal/testutil"
 	"github.com/containerd/containerd/v2/pkg/filters"
 	"github.com/containerd/containerd/v2/pkg/namespaces"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 	"github.com/containerd/containerd/v2/plugins/snapshots/native"
 	"github.com/containerd/errdefs"
 	bolt "go.etcd.io/bbolt"
diff --git a/core/runtime/v2/bundle_linux_test.go b/core/runtime/v2/bundle_linux_test.go
@@ -26,9 +26,9 @@ import (
 	"syscall"
 	"testing"
 
-	"github.com/containerd/containerd/v2/internal/testutil"
 	"github.com/containerd/containerd/v2/pkg/namespaces"
 	"github.com/containerd/containerd/v2/pkg/oci"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 	"github.com/containerd/typeurl/v2"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/stretchr/testify/assert"
diff --git a/core/runtime/v2/bundle_test.go b/core/runtime/v2/bundle_test.go
@@ -19,5 +19,5 @@ package v2
 import (
 	// When testutil is imported for one platform (bundle_linux_test.go) it
 	// should be imported for all platforms.
-	_ "github.com/containerd/containerd/v2/internal/testutil"
+	_ "github.com/containerd/containerd/v2/pkg/testutil"
 )
diff --git a/core/snapshots/storage/bolt_test.go b/core/snapshots/storage/bolt_test.go
@@ -22,7 +22,7 @@ import (
 
 	// Does not require root but flag must be defined for snapshot tests
 
-	_ "github.com/containerd/containerd/v2/internal/testutil"
+	_ "github.com/containerd/containerd/v2/pkg/testutil"
 )
 
 func TestMetastore(t *testing.T) {
diff --git a/core/snapshots/testsuite/testsuite.go b/core/snapshots/testsuite/testsuite.go
@@ -31,8 +31,8 @@ import (
 	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/containerd/v2/core/snapshots"
 	"github.com/containerd/containerd/v2/internal/randutil"
-	"github.com/containerd/containerd/v2/internal/testutil"
 	"github.com/containerd/containerd/v2/pkg/namespaces"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 	"github.com/containerd/continuity/fs/fstest"
 	"github.com/containerd/errdefs"
 	"github.com/containerd/log/logtest"
diff --git a/integration/client/client_test.go b/integration/client/client_test.go
@@ -39,9 +39,9 @@ import (
 	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/defaults"
 	imagelist "github.com/containerd/containerd/v2/integration/images"
-	"github.com/containerd/containerd/v2/internal/testutil"
 	"github.com/containerd/containerd/v2/pkg/deprecation"
 	"github.com/containerd/containerd/v2/pkg/namespaces"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 	"github.com/containerd/errdefs"
 	"github.com/containerd/log"
 	"github.com/containerd/platforms"
diff --git a/integration/client/restart_monitor_test.go b/integration/client/restart_monitor_test.go
@@ -35,8 +35,8 @@ import (
 	. "github.com/containerd/containerd/v2/client"
 	srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
 	"github.com/containerd/containerd/v2/core/runtime/restart"
-	"github.com/containerd/containerd/v2/internal/testutil"
 	"github.com/containerd/containerd/v2/pkg/oci"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 	"github.com/containerd/typeurl/v2"
 	"github.com/stretchr/testify/require"
 )
diff --git a/pkg/archive/issues_test.go b/pkg/archive/issues_test.go
@@ -24,8 +24,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/containerd/containerd/v2/internal/testutil"
 	"github.com/containerd/containerd/v2/pkg/archive/compression"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 )
 
 // TestPrefixHeaderReadable tests that files that could be created with the
diff --git a/pkg/archive/tar_linux_test.go b/pkg/archive/tar_linux_test.go
@@ -26,7 +26,7 @@ import (
 	"testing"
 
 	"github.com/containerd/containerd/v2/core/mount"
-	"github.com/containerd/containerd/v2/internal/testutil"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 	"github.com/containerd/containerd/v2/plugins/snapshots/overlay/overlayutils"
 	"github.com/containerd/continuity/fs"
 	"github.com/containerd/continuity/fs/fstest"
diff --git a/pkg/archive/tar_test.go b/pkg/archive/tar_test.go
@@ -33,8 +33,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/containerd/containerd/v2/internal/testutil"
 	"github.com/containerd/containerd/v2/pkg/archive/tartest"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 	"github.com/containerd/continuity/fs"
 	"github.com/containerd/continuity/fs/fstest"
 	"github.com/opencontainers/go-digest"
diff --git a/pkg/oci/spec_opts_linux_test.go b/pkg/oci/spec_opts_linux_test.go
@@ -24,8 +24,8 @@ import (
 	"testing"
 
 	"github.com/containerd/containerd/v2/core/containers"
-	"github.com/containerd/containerd/v2/internal/testutil"
 	"github.com/containerd/containerd/v2/pkg/cap"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 	"github.com/containerd/continuity/fs/fstest"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/stretchr/testify/assert"
diff --git a/pkg/oci/spec_test.go b/pkg/oci/spec_test.go
@@ -24,8 +24,8 @@ import (
 	"github.com/opencontainers/runtime-spec/specs-go"
 
 	"github.com/containerd/containerd/v2/core/containers"
-	"github.com/containerd/containerd/v2/internal/testutil"
 	"github.com/containerd/containerd/v2/pkg/namespaces"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 )
 
 func TestGenerateSpec(t *testing.T) {
diff --git a/pkg/testutil/helpers.go b/pkg/testutil/helpers.go
diff --git a/pkg/testutil/helpers_unix.go b/pkg/testutil/helpers_unix.go
diff --git a/pkg/testutil/helpers_windows.go b/pkg/testutil/helpers_windows.go
diff --git a/plugins/content/local/store_test.go b/plugins/content/local/store_test.go
@@ -35,7 +35,7 @@ import (
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/core/content/testsuite"
 	"github.com/containerd/containerd/v2/internal/randutil"
-	"github.com/containerd/containerd/v2/internal/testutil"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 	"github.com/containerd/errdefs"
 
 	"github.com/opencontainers/go-digest"
diff --git a/plugins/snapshots/blockfile/blockfile_test.go b/plugins/snapshots/blockfile/blockfile_test.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/containerd/containerd/v2/core/snapshots"
 	"github.com/containerd/containerd/v2/core/snapshots/testsuite"
-	"github.com/containerd/containerd/v2/internal/testutil"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 )
 
 func newSnapshotter(t *testing.T) func(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) {
diff --git a/plugins/snapshots/btrfs/btrfs_test.go b/plugins/snapshots/btrfs/btrfs_test.go
@@ -33,7 +33,7 @@ import (
 	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/containerd/v2/core/snapshots"
 	"github.com/containerd/containerd/v2/core/snapshots/testsuite"
-	"github.com/containerd/containerd/v2/internal/testutil"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 	"github.com/containerd/continuity/testutil/loopback"
 	"github.com/containerd/plugin"
 	"golang.org/x/sys/unix"
diff --git a/plugins/snapshots/devmapper/dmsetup/dmsetup_test.go b/plugins/snapshots/devmapper/dmsetup/dmsetup_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 
 	"github.com/containerd/containerd/v2/core/mount"
-	"github.com/containerd/containerd/v2/internal/testutil"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 	"github.com/docker/go-units"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/sys/unix"
diff --git a/plugins/snapshots/devmapper/pool_device_test.go b/plugins/snapshots/devmapper/pool_device_test.go
@@ -28,7 +28,7 @@ import (
 	"time"
 
 	"github.com/containerd/containerd/v2/core/mount"
-	"github.com/containerd/containerd/v2/internal/testutil"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 	"github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup"
 	"github.com/containerd/log"
 	"github.com/docker/go-units"
diff --git a/plugins/snapshots/devmapper/snapshotter_test.go b/plugins/snapshots/devmapper/snapshotter_test.go
@@ -32,8 +32,8 @@ import (
 	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/containerd/v2/core/snapshots"
 	"github.com/containerd/containerd/v2/core/snapshots/testsuite"
-	"github.com/containerd/containerd/v2/internal/testutil"
 	"github.com/containerd/containerd/v2/pkg/namespaces"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 	"github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup"
 	"github.com/containerd/log"
 )
diff --git a/plugins/snapshots/native/native_test.go b/plugins/snapshots/native/native_test.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/containerd/containerd/v2/core/snapshots"
 	"github.com/containerd/containerd/v2/core/snapshots/testsuite"
-	"github.com/containerd/containerd/v2/internal/testutil"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 )
 
 func newSnapshotter(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) {
diff --git a/plugins/snapshots/overlay/overlay_test.go b/plugins/snapshots/overlay/overlay_test.go
@@ -31,7 +31,7 @@ import (
 	"github.com/containerd/containerd/v2/core/snapshots"
 	"github.com/containerd/containerd/v2/core/snapshots/storage"
 	"github.com/containerd/containerd/v2/core/snapshots/testsuite"
-	"github.com/containerd/containerd/v2/internal/testutil"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 	"github.com/containerd/containerd/v2/plugins/snapshots/overlay/overlayutils"
 	"github.com/opencontainers/runtime-spec/specs-go"
 )
diff --git a/plugins/snapshots/overlay/overlayutils/check_test.go b/plugins/snapshots/overlay/overlayutils/check_test.go
@@ -22,7 +22,7 @@ import (
 	"os/exec"
 	"testing"
 
-	"github.com/containerd/containerd/v2/internal/testutil"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 	"github.com/containerd/continuity/testutil/loopback"
 )
 
diff --git a/plugins/snapshots/windows/windows_test.go b/plugins/snapshots/windows/windows_test.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/containerd/containerd/v2/core/snapshots"
 	"github.com/containerd/containerd/v2/core/snapshots/testsuite"
-	"github.com/containerd/containerd/v2/internal/testutil"
+	"github.com/containerd/containerd/v2/pkg/testutil"
 )
 
 func newSnapshotter(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) {

Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,5 @@ package v2`
`19`	`19`	`import (`
`20`	`20`	`// When testutil is imported for one platform (bundle_linux_test.go) it`
`21`	`21`	`// should be imported for all platforms.`
`22`		`- _ "github.com/containerd/containerd/v2/internal/testutil"`
	`22`	`+ _ "github.com/containerd/containerd/v2/pkg/testutil"`
`23`	`23`	`)`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`
`23`	`23`	`// Does not require root but flag must be defined for snapshot tests`
`24`	`24`
`25`		`- _ "github.com/containerd/containerd/v2/internal/testutil"`
	`25`	`+ _ "github.com/containerd/containerd/v2/pkg/testutil"`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`func TestMetastore(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ import (`
`24`	`24`	`"strings"`
`25`	`25`	`"testing"`
`26`	`26`
`27`		`- "github.com/containerd/containerd/v2/internal/testutil"`
`28`	`27`	`"github.com/containerd/containerd/v2/pkg/archive/compression"`
	`28`	`+ "github.com/containerd/containerd/v2/pkg/testutil"`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`// TestPrefixHeaderReadable tests that files that could be created with the`