kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Devmapper: wrap calls to os/exec for easier mocking

Browse source
This commit is contained in:
Solomon Hykes 2013-11-21 02:16:26 +00:00
parent 2b7c63b1b5
commit 60f728b170
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
graphdriver/devmapper/deviceset.go
View file

@ -6,7 +6,6 @@ import (
"github.com/dotcloud/docker/utils"
"io"
"io/ioutil"
"os/exec"
"path"
"path/filepath"
"strconv"
@ -223,9 +222,9 @@ func (devices *DeviceSet) activateDeviceIfNeeded(hash string) error {
func (devices *DeviceSet) createFilesystem(info *DevInfo) error {
devname := info.DevName()
err := exec.Command("mkfs.ext4", "-E", "discard,lazy_itable_init=0,lazy_journal_init=0", devname).Run()
err := execRun("mkfs.ext4", "-E", "discard,lazy_itable_init=0,lazy_journal_init=0", devname)
if err != nil {
err = exec.Command("mkfs.ext4", "-E", "discard,lazy_itable_init=0", devname).Run()
err = execRun("mkfs.ext4", "-E", "discard,lazy_itable_init=0", devname)
}
if err != nil {
utils.Debugf("\n--->Err: %s\n", err)

5
graphdriver/devmapper/sys.go
View file

@ -2,6 +2,7 @@ package devmapper
import (
"os"
"os/exec"
"syscall"
)
@ -28,6 +29,10 @@ var (
osRemoveAll = os.RemoveAll
osRename = os.Rename
osReadlink = os.Readlink
execRun = func(name string, args ...string) error {
return exec.Command(name, args...).Run()
}
)
const (