remove pkg/testutil/loopback_linux.go and use continuity/testutil/loopback

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
This commit is contained in:
Akihiro Suda
2018-10-02 13:08:29 +09:00
parent ac01f20a8e
commit 5349fa31df
10 changed files with 156 additions and 20 deletions

View File

@@ -31,6 +31,7 @@ import (
"github.com/containerd/containerd/pkg/testutil"
"github.com/containerd/containerd/snapshots"
"github.com/containerd/containerd/snapshots/testsuite"
"github.com/containerd/continuity/testutil/loopback"
"github.com/pkg/errors"
"golang.org/x/sys/unix"
)
@@ -51,7 +52,7 @@ func boltSnapshotter(t *testing.T) func(context.Context, string) (snapshots.Snap
if os.Getpagesize() > 4096 {
loopbackSize = int64(650 << 20) // 650 MB
}
deviceName, cleanupDevice, err := testutil.NewLoopback(loopbackSize)
deviceName, cleanupDevice, err := loopback.New(loopbackSize)
if err != nil {
return nil, nil, err

View File

@@ -25,6 +25,7 @@ import (
"testing"
"github.com/containerd/containerd/pkg/testutil"
"github.com/containerd/continuity/testutil/loopback"
)
func testOverlaySupported(t testing.TB, expected bool, mkfs ...string) {
@@ -35,7 +36,7 @@ func testOverlaySupported(t testing.TB, expected bool, mkfs ...string) {
}
defer os.RemoveAll(mnt)
deviceName, cleanupDevice, err := testutil.NewLoopback(100 << 20) // 100 MB
deviceName, cleanupDevice, err := loopback.New(100 << 20) // 100 MB
if err != nil {
t.Fatal(err)
}