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

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

View File

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

View File

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

View File

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

View File

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

View File

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