github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #9917 from AkihiroSuda/mv-testutil

Browse Source 
mv internal/testutil pkg/testutil
This commit is contained in:
Akihiro Suda
2024-03-12 12:01:16 +00:00
committed by GitHub
parent 9c77c389d8 d9b9160ae1
commit 5a23e8878c
26 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/content/testsuite/testsuite.go
View File

@@ -29,7 +29,7 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/core/content" "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/errdefs"
"github.com/containerd/log/logtest" "github.com/containerd/log/logtest"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"

2
core/metadata/snapshot_test.go
View File

@@ -30,9 +30,9 @@ import (
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/core/snapshots/testsuite" "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/filters"
"github.com/containerd/containerd/v2/pkg/namespaces" "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/containerd/v2/plugins/snapshots/native"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"

2
core/runtime/v2/bundle_linux_test.go
View File

@@ -26,9 +26,9 @@ import (
"syscall" "syscall"
"testing" "testing"
"github.com/containerd/containerd/v2/internal/testutil"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/pkg/testutil"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

2
core/runtime/v2/bundle_test.go
View File

@@ -19,5 +19,5 @@ package v2
import ( import (
// When testutil is imported for one platform (bundle_linux_test.go) it // When testutil is imported for one platform (bundle_linux_test.go) it
// should be imported for all platforms. // should be imported for all platforms.
_ "github.com/containerd/containerd/v2/internal/testutil" _ "github.com/containerd/containerd/v2/pkg/testutil"
) )

2
core/snapshots/storage/bolt_test.go
View File

@@ -22,7 +22,7 @@ import (
// Does not require root but flag must be defined for snapshot tests // 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) { func TestMetastore(t *testing.T) {

2
core/snapshots/testsuite/testsuite.go
View File

@@ -31,8 +31,8 @@ import (
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/internal/randutil" "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/namespaces"
"github.com/containerd/containerd/v2/pkg/testutil"
"github.com/containerd/continuity/fs/fstest" "github.com/containerd/continuity/fs/fstest"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log/logtest" "github.com/containerd/log/logtest"

2
integration/client/client_test.go
View File

@@ -39,9 +39,9 @@ import (
"github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
imagelist "github.com/containerd/containerd/v2/integration/images" 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/deprecation"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/testutil"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/platforms" "github.com/containerd/platforms"

2
integration/client/restart_monitor_test.go
View File

@@ -35,8 +35,8 @@ import (
. "github.com/containerd/containerd/v2/client" . "github.com/containerd/containerd/v2/client"
srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
"github.com/containerd/containerd/v2/core/runtime/restart" "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/oci"
"github.com/containerd/containerd/v2/pkg/testutil"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

2
pkg/archive/issues_test.go
View File

@@ -24,8 +24,8 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/containerd/containerd/v2/internal/testutil"
"github.com/containerd/containerd/v2/pkg/archive/compression" "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 // TestPrefixHeaderReadable tests that files that could be created with the

2
pkg/archive/tar_linux_test.go
View File

@@ -26,7 +26,7 @@ import (
"testing" "testing"
"github.com/containerd/containerd/v2/core/mount" "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/containerd/v2/plugins/snapshots/overlay/overlayutils"
"github.com/containerd/continuity/fs" "github.com/containerd/continuity/fs"
"github.com/containerd/continuity/fs/fstest" "github.com/containerd/continuity/fs/fstest"

2
pkg/archive/tar_test.go
View File

@@ -33,8 +33,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/containerd/containerd/v2/internal/testutil"
"github.com/containerd/containerd/v2/pkg/archive/tartest" "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"
"github.com/containerd/continuity/fs/fstest" "github.com/containerd/continuity/fs/fstest"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"

2
pkg/oci/spec_opts_linux_test.go
View File

@@ -24,8 +24,8 @@ import (
"testing" "testing"
"github.com/containerd/containerd/v2/core/containers" "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/cap"
"github.com/containerd/containerd/v2/pkg/testutil"
"github.com/containerd/continuity/fs/fstest" "github.com/containerd/continuity/fs/fstest"
specs "github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

2
pkg/oci/spec_test.go
View File

@@ -24,8 +24,8 @@ import (
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
"github.com/containerd/containerd/v2/core/containers" "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/namespaces"
"github.com/containerd/containerd/v2/pkg/testutil"
) )
func TestGenerateSpec(t *testing.T) { func TestGenerateSpec(t *testing.T) {

0
internal/testutil/helpers.go → pkg/testutil/helpers.go
View File

0
internal/testutil/helpers_unix.go → pkg/testutil/helpers_unix.go
View File

0
internal/testutil/helpers_windows.go → pkg/testutil/helpers_windows.go
View File

2
plugins/content/local/store_test.go
View File

@@ -35,7 +35,7 @@ import (
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/content/testsuite" "github.com/containerd/containerd/v2/core/content/testsuite"
"github.com/containerd/containerd/v2/internal/randutil" "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/containerd/errdefs"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"

2
plugins/snapshots/blockfile/blockfile_test.go
View File

@@ -22,7 +22,7 @@ import (
"github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/core/snapshots/testsuite" "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) { func newSnapshotter(t *testing.T) func(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) {

2
plugins/snapshots/btrfs/btrfs_test.go
View File

@@ -33,7 +33,7 @@ import (
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/core/snapshots/testsuite" "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/continuity/testutil/loopback"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"

2
plugins/snapshots/devmapper/dmsetup/dmsetup_test.go
View File

@@ -24,7 +24,7 @@ import (
"testing" "testing"
"github.com/containerd/containerd/v2/core/mount" "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/docker/go-units"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"

2
plugins/snapshots/devmapper/pool_device_test.go
View File

@@ -28,7 +28,7 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/core/mount" "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/containerd/v2/plugins/snapshots/devmapper/dmsetup"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/docker/go-units" "github.com/docker/go-units"

2
plugins/snapshots/devmapper/snapshotter_test.go
View File

@@ -32,8 +32,8 @@ import (
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/core/snapshots/testsuite" "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/namespaces"
"github.com/containerd/containerd/v2/pkg/testutil"
"github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup" "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup"
"github.com/containerd/log" "github.com/containerd/log"
) )

2
plugins/snapshots/native/native_test.go
View File

@@ -23,7 +23,7 @@ import (
"github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/core/snapshots/testsuite" "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) { func newSnapshotter(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) {

2
plugins/snapshots/overlay/overlay_test.go
View File

@@ -31,7 +31,7 @@ import (
"github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/core/snapshots/storage" "github.com/containerd/containerd/v2/core/snapshots/storage"
"github.com/containerd/containerd/v2/core/snapshots/testsuite" "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/containerd/containerd/v2/plugins/snapshots/overlay/overlayutils"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
) )

2
plugins/snapshots/overlay/overlayutils/check_test.go
View File

@@ -22,7 +22,7 @@ import (
"os/exec" "os/exec"
"testing" "testing"
"github.com/containerd/containerd/v2/internal/testutil" "github.com/containerd/containerd/v2/pkg/testutil"
"github.com/containerd/continuity/testutil/loopback" "github.com/containerd/continuity/testutil/loopback"
) )

2
plugins/snapshots/windows/windows_test.go
View File

@@ -25,7 +25,7 @@ import (
"github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/core/snapshots/testsuite" "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) { func newSnapshotter(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) {