Skip to content

Commit 29dab3b

Browse files
dmcgowandmcgowan
authored
Merge pull request #2694 from AkihiroSuda/continuity-testutil
remove pkg/testutil/loopback_linux.go and use continuity/testutil/loopback
2 parents ac01f20 + 5349fa3 commit 29dab3b

10 files changed

Lines changed: 156 additions & 20 deletions

File tree

mount/lookup_test/lookup_linux_test.go renamed to mount/lookup_linux_test.go

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,7 @@
1616
limitations under the License.
1717
*/
1818

19-
// FIXME: we can't put this test to the mount package:
20-
// import cycle not allowed in test
21-
// package github.com/containerd/containerd/mount (test)
22-
// imports github.com/containerd/containerd/pkg/testutil
23-
// imports github.com/containerd/containerd/mount
24-
//
25-
// NOTE: we can't have this as lookup_test (compilation fails)
26-
package lookuptest
19+
package mount
2720

2821
import (
2922
"fmt"
@@ -34,14 +27,16 @@ import (
3427
"strings"
3528
"testing"
3629

37-
"github.com/containerd/containerd/mount"
38-
"github.com/containerd/containerd/pkg/testutil"
30+
// containerd/pkg/testutil has circular dependency on this mount pkg.
31+
// so we use continuity/testutil instead.
32+
"github.com/containerd/continuity/testutil"
33+
"github.com/containerd/continuity/testutil/loopback"
3934
"gotest.tools/assert"
4035
)
4136

4237
func checkLookup(t *testing.T, fsType, mntPoint, dir string) {
4338
t.Helper()
44-
info, err := mount.Lookup(dir)
39+
info, err := Lookup(dir)
4540
assert.NilError(t, err)
4641
assert.Equal(t, fsType, info.FSType)
4742
assert.Equal(t, mntPoint, info.Mountpoint)
@@ -55,7 +50,7 @@ func testLookup(t *testing.T, fsType string) {
5550
}
5651
defer os.RemoveAll(mnt)
5752

58-
deviceName, cleanupDevice, err := testutil.NewLoopback(100 << 20) // 100 MB
53+
deviceName, cleanupDevice, err := loopback.New(100 << 20) // 100 MB
5954
if err != nil {
6055
t.Fatal(err)
6156
}

‎snapshots/btrfs/btrfs_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
"github.com/containerd/containerd/pkg/testutil"
3232
"github.com/containerd/containerd/snapshots"
3333
"github.com/containerd/containerd/snapshots/testsuite"
34+
"github.com/containerd/continuity/testutil/loopback"
3435
"github.com/pkg/errors"
3536
"golang.org/x/sys/unix"
3637
)
@@ -51,7 +52,7 @@ func boltSnapshotter(t *testing.T) func(context.Context, string) (snapshots.Snap
5152
if os.Getpagesize() > 4096 {
5253
loopbackSize = int64(650 << 20) // 650 MB
5354
}
54-
deviceName, cleanupDevice, err := testutil.NewLoopback(loopbackSize)
55+
deviceName, cleanupDevice, err := loopback.New(loopbackSize)
5556

5657
if err != nil {
5758
return nil, nil, err

‎snapshots/overlay/check_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"testing"
2626

2727
"github.com/containerd/containerd/pkg/testutil"
28+
"github.com/containerd/continuity/testutil/loopback"
2829
)
2930

3031
func testOverlaySupported(t testing.TB, expected bool, mkfs ...string) {
@@ -35,7 +36,7 @@ func testOverlaySupported(t testing.TB, expected bool, mkfs ...string) {
3536
}
3637
defer os.RemoveAll(mnt)
3738

38-
deviceName, cleanupDevice, err := testutil.NewLoopback(100 << 20) // 100 MB
39+
deviceName, cleanupDevice, err := loopback.New(100 << 20) // 100 MB
3940
if err != nil {
4041
t.Fatal(err)
4142
}

‎vendor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ github.com/containerd/cgroups 5e610833b72089b37d0e615de9a92dfc043757c2
44
github.com/containerd/typeurl a93fcdb778cd272c6e9b3028b2f42d813e785d40
55
github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
66
github.com/containerd/btrfs 2e1aa0ddf94f91fa282b6ed87c23bf0d64911244
7-
github.com/containerd/continuity 7f53d412b9eb1cbf744c2063185d703a0ee34700
7+
github.com/containerd/continuity bd77b46c8352f74eb12c85bdc01f4b90f69d66b4
88
github.com/coreos/go-systemd 48702e0da86bd25e76cfef347e2adeb434a0d0a6
99
github.com/docker/go-metrics 4ea375f7759c82740c893fc030bc37088d2ec098
1010
github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9

‎vendor/github.com/containerd/continuity/testutil/helpers.go‎

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/continuity/testutil/helpers_unix.go‎

Lines changed: 57 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/continuity/testutil/helpers_windows.go‎

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/testutil/loopback_linux.go renamed to vendor/github.com/containerd/continuity/testutil/loopback/loopback_linux.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mount/lookup_test/dummy.go renamed to vendor/github.com/containerd/continuity/testutil/mount_linux.go

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/continuity/testutil/mount_other.go‎

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)