Merge pull request #9917 from AkihiroSuda/mv-testutil

mv internal/testutil pkg/testutil
This commit is contained in:
Akihiro Suda
2024-03-12 12:01:16 +00:00
committed by GitHub
26 changed files with 23 additions and 23 deletions

View File

@@ -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"

View File

@@ -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) {

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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) {

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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) {