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

snapshot/btrfs: simplify test setup 

After reviewing this closer, we removed a few buffers in favor
`(*exec.Command).Output` and simplified the loop file creation method to
just use `(*os.File).Truncate`.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day 2017-02-17 16:53:11 -08:00
parent 8fdccbf8e9
commit 5922756d8b
No known key found for this signature in database
GPG Key ID: 67B3DED84EDC823F
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
snapshot/btrfs/btrfs_test.go
View File

@ -1,7 +1,6 @@
package btrfs
import (
"bytes"
"io/ioutil"
"os"
"os/exec"
@ -141,26 +140,19 @@ func setupBtrfsLoopbackDevice(t *testing.T, mountPoint string) *testDevice {
t.Log("Temporary file created", file.Name())
// initialize file with 100 MiB
zero := [mib]byte{}
for i := 0; i < 100; i++ {
_, err = file.Write(zero[:])
if err != nil {
t.Fatal("Could not write to btrfs file", err)
}
if err := file.Truncate(100 << 20); err != nil {
t.Fatal(err)
}
file.Close()
// create device
losetup := exec.Command("losetup", "--find", "--show", file.Name())
var stdout, stderr bytes.Buffer
losetup.Stdout = &stdout
losetup.Stderr = &stderr
err = losetup.Run()
p, err := losetup.Output()
if err != nil {
t.Log(stderr.String())
t.Fatal("Could not run losetup", err)
t.Fatal(err)
}
deviceName := strings.TrimSpace(stdout.String())
deviceName := strings.TrimSpace(string(p))
t.Log("Created loop device", deviceName)
// format