vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Remove shelling out to mount

Browse source 
Also remove the target from the Mount struct because it should not be
used at all.  The target can be variable and set by a caller, not by the
snapshot drivers.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2017-01-17 13:26:56 -08:00
parent c0fdda03cc
commit a7a6270f2a
9 changed files with 28 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

24
snapshot/btrfs/btrfs_test.go
View file

@ -27,11 +27,12 @@ func TestBtrfs(t *testing.T) {
}
defer os.RemoveAll(root)
target := filepath.Join(root, "test")
sm, err := NewBtrfs(device.deviceName, root)
if err != nil {
t.Fatal(err)
}
mounts, err := sm.Prepare(filepath.Join(root, "test"), "")
mounts, err := sm.Prepare(target, "")
if err != nil {
t.Fatal(err)
}
@ -48,16 +49,16 @@ func TestBtrfs(t *testing.T) {
}
}
if err := os.MkdirAll(mounts[0].Target, 0755); err != nil {
if err := os.MkdirAll(target, 0755); err != nil {
t.Fatal(err)
}
if err := containerd.MountAll(mounts...); err != nil {
if err := containerd.MountAll(mounts, target); err != nil {
t.Fatal(err)
}
defer testutil.UnmountAll(t, mounts)
defer testutil.Unmount(t, target)
// write in some data
if err := ioutil.WriteFile(filepath.Join(mounts[0].Target, "foo"), []byte("content"), 0777); err != nil {
if err := ioutil.WriteFile(filepath.Join(target, "foo"), []byte("content"), 0777); err != nil {
t.Fatal(err)
}
@ -78,26 +79,27 @@ func TestBtrfs(t *testing.T) {
}
}()
mounts, err = sm.Prepare(filepath.Join(root, "test2"), filepath.Join(root, "snapshots/committed"))
target = filepath.Join(root, "test2")
mounts, err = sm.Prepare(target, filepath.Join(root, "snapshots/committed"))
if err != nil {
t.Fatal(err)
}
if err := os.MkdirAll(filepath.Join(root, "test2"), 0755); err != nil {
if err := os.MkdirAll(target, 0755); err != nil {
t.Fatal(err)
}
if err := containerd.MountAll(mounts...); err != nil {
if err := containerd.MountAll(mounts, target); err != nil {
t.Fatal(err)
}
defer testutil.UnmountAll(t, mounts)
defer testutil.Unmount(t, target)
// TODO(stevvooe): Verify contents of "foo"
if err := ioutil.WriteFile(filepath.Join(mounts[0].Target, "bar"), []byte("content"), 0777); err != nil {
if err := ioutil.WriteFile(filepath.Join(target, "bar"), []byte("content"), 0777); err != nil {
t.Fatal(err)
}
if err := sm.Commit(filepath.Join(root, "snapshots/committed2"), filepath.Join(root, "test2")); err != nil {
if err := sm.Commit(filepath.Join(root, "snapshots/committed2"), target); err != nil {
t.Fatal(err)
}
defer func() {