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

Merge pull request #3992 from mxpv/losetup

Browse Source 
Make losetup tests less flaky
This commit is contained in:
Derek McGowan 2020-01-30 12:22:33 -08:00 committed by GitHub
commit 46d1fb2fdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
snapshots/devmapper/losetup/losetup.go
View File

@ -23,6 +23,7 @@ import (
"strings" "strings"
"github.com/pkg/errors" "github.com/pkg/errors"
"golang.org/x/sys/unix"
) )
// FindAssociatedLoopDevices returns a list of loop devices attached to a given image // FindAssociatedLoopDevices returns a list of loop devices attached to a given image
@ -65,7 +66,7 @@ func RemoveLoopDevicesAssociatedWithImage(imagePath string) error {
} }
for _, loopDevice := range loopDevices { for _, loopDevice := range loopDevices {
if err = DetachLoopDevice(loopDevice); err != nil { if err = DetachLoopDevice(loopDevice); err != nil && err != unix.ENOENT {
return err return err
} }
} }
@ -75,9 +76,15 @@ func RemoveLoopDevicesAssociatedWithImage(imagePath string) error {
// losetup is a wrapper around losetup command line tool // losetup is a wrapper around losetup command line tool
func losetup(args ...string) (string, error) { func losetup(args ...string) (string, error) {
data, err := exec.Command("losetup", args...).CombinedOutput() cmd := exec.Command("losetup", args...)
cmd.Env = append(cmd.Env, "LANG=C")
data, err := cmd.CombinedOutput()
output := string(data) output := string(data)
if err != nil { if err != nil {
if strings.Contains(output, "No such file or directory") || strings.Contains(output, "No such device") {
return "", unix.ENOENT
}
return "", errors.Wrapf(err, "losetup %s\nerror: %s\n", strings.Join(args, " "), output) return "", errors.Wrapf(err, "losetup %s\nerror: %s\n", strings.Join(args, " "), output)
} }

9
snapshots/devmapper/losetup/losetup_test.go
View File

@ -23,10 +23,12 @@ import (
"os" "os"
"testing" "testing"
"github.com/containerd/containerd/pkg/testutil"
"github.com/docker/go-units" "github.com/docker/go-units"
"golang.org/x/sys/unix"
"gotest.tools/assert" "gotest.tools/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/assert/cmp"
"github.com/containerd/containerd/pkg/testutil"
) )
func TestLosetup(t *testing.T) { func TestLosetup(t *testing.T) {
@ -98,6 +100,11 @@ func TestLosetup(t *testing.T) {
err := RemoveLoopDevicesAssociatedWithImage("") err := RemoveLoopDevicesAssociatedWithImage("")
assert.NilError(t, err) assert.NilError(t, err)
}) })
t.Run("DetachInvalidDevice", func(t *testing.T) {
err := DetachLoopDevice("/dev/loop_invalid_idx")
assert.Equal(t, unix.ENOENT, err)
})
} }
func createSparseImage(t *testing.T) string { func createSparseImage(t *testing.T) string {