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

snapshot: Fix leaked mounts and temp directories

Browse Source 
Signed-off-by: Samuel Karp <skarp@amazon.com>
This commit is contained in:
Samuel Karp
2017-01-12 01:08:00 +00:00
parent e2eb06dd3d
commit 2c36c387de
4 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
snapshot/btrfs_test.go
View File

@@ -53,11 +53,7 @@ func TestBtrfs(t *testing.T) {
if err := containerd.MountAll(mounts...); err != nil {
t.Fatal(err)
}
defer func(mounts []containerd.Mount) {
for _, mount := range mounts {
unmount(t, mount.Target)
}
}(mounts)
defer unmountAll(t, mounts)
// write in some data
if err := ioutil.WriteFile(filepath.Join(mounts[0].Target, "foo"), []byte("content"), 0777); err != nil {
@@ -93,11 +89,7 @@ func TestBtrfs(t *testing.T) {
if err := containerd.MountAll(mounts...); err != nil {
t.Fatal(err)
}
defer func(mounts []containerd.Mount) {
for _, mount := range mounts {
unmount(t, mount.Target)
}
}(mounts)
defer unmountAll(t, mounts)
// TODO(stevvooe): Verify contents of "foo"
if err := ioutil.WriteFile(filepath.Join(mounts[0].Target, "bar"), []byte("content"), 0777); err != nil {
@@ -214,13 +206,3 @@ func removeBtrfsLoopbackDevice(t *testing.T, device *testDevice) {
t.Error(err)
}
}
func unmount(t *testing.T, mountPoint string) {
t.Log("unmount", mountPoint)
umount := exec.Command("umount", mountPoint)
err := umount.Run()
if err != nil {
t.Error("Could not umount", mountPoint, err)
}
}