docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

graphtest: fix cleanup logic 

device Base should not exists on failure:

--- FAIL: TestDevmapperCreateBase (0.06s)
    graphtest_unix.go:122: stat
/tmp/docker-graphtest-079240530/devicemapper/mnt/Base/rootfs/a subdir:
no such file or directory
--- FAIL: TestDevmapperCreateSnap (0.00s)
    graphtest_unix.go:219: devmapper: device Base already
exists.

it should be:

--- FAIL: TestDevmapperCreateBase (0.25s)
	graphtest_unix.go:122: stat
/tmp/docker-graphtest-828994195/devicemapper/mnt/Base/rootfs/a subdir:
no such file or directory
--- FAIL: TestDevmapperCreateSnap (0.13s)
	graphtest_unix.go:122: stat
/tmp/docker-graphtest-828994195/devicemapper/mnt/Snap/rootfs/a subdir:
no such file or directory

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-05-29 11:51:06 +02:00
parent 0b5e84cc8d
commit b18062122d
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/graphdriver/devmapper/deviceset.go
View File

@ -1088,7 +1088,7 @@ func (devices *DeviceSet) setupVerifyBaseImageUUIDFS(baseInfo *devInfo) error {
} }
if err := devices.verifyBaseDeviceUUIDFS(baseInfo); err != nil { if err := devices.verifyBaseDeviceUUIDFS(baseInfo); err != nil {
return fmt.Errorf("devmapper: Base Device UUID and Filesystem verification failed.%v", err) return fmt.Errorf("devmapper: Base Device UUID and Filesystem verification failed: %v", err)
} }
return nil return nil

40
daemon/graphdriver/graphtest/graphtest_unix.go
View File

@ -181,6 +181,12 @@ func DriverTestCreateEmpty(t *testing.T, drivername string) {
t.Fatal(err) t.Fatal(err)
} }
defer func() {
if err := driver.Remove("empty"); err != nil {
t.Fatal(err)
}
}()
if !driver.Exists("empty") { if !driver.Exists("empty") {
t.Fatal("Newly created image doesn't exist") t.Fatal("Newly created image doesn't exist")
} }
@ -203,11 +209,6 @@ func DriverTestCreateEmpty(t *testing.T, drivername string) {
} }
driver.Put("empty") driver.Put("empty")
if err := driver.Remove("empty"); err != nil {
t.Fatal(err)
}
} }
func createBase(t *testing.T, driver graphdriver.Driver, name string) { func createBase(t *testing.T, driver graphdriver.Driver, name string) {
@ -260,7 +261,6 @@ func verifyBase(t *testing.T, driver graphdriver.Driver, name string) {
if len(fis) != 2 { if len(fis) != 2 {
t.Fatal("Unexpected files in base image") t.Fatal("Unexpected files in base image")
} }
} }
// DriverTestCreateBase create a base driver and verify. // DriverTestCreateBase create a base driver and verify.
@ -269,11 +269,12 @@ func DriverTestCreateBase(t *testing.T, drivername string) {
defer PutDriver(t) defer PutDriver(t)
createBase(t, driver, "Base") createBase(t, driver, "Base")
defer func() {
if err := driver.Remove("Base"); err != nil {
t.Fatal(err)
}
}()
verifyBase(t, driver, "Base") verifyBase(t, driver, "Base")
if err := driver.Remove("Base"); err != nil {
t.Fatal(err)
}
} }
// DriverTestCreateSnap Create a driver and snap and verify. // DriverTestCreateSnap Create a driver and snap and verify.
@ -283,17 +284,20 @@ func DriverTestCreateSnap(t *testing.T, drivername string) {
createBase(t, driver, "Base") createBase(t, driver, "Base")
defer func() {
if err := driver.Remove("Base"); err != nil {
t.Fatal(err)
}
}()
if err := driver.Create("Snap", "Base", "", nil); err != nil { if err := driver.Create("Snap", "Base", "", nil); err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer func() {
if err := driver.Remove("Snap"); err != nil {
t.Fatal(err)
}
}()
verifyBase(t, driver, "Snap") verifyBase(t, driver, "Snap")
if err := driver.Remove("Snap"); err != nil {
t.Fatal(err)
}
if err := driver.Remove("Base"); err != nil {
t.Fatal(err)
}
} }