Browse code
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>
Antonio Murdaca authored on 2016/05/29 18:51:06Showing 2 changed files
| ... | ... |
@@ -1088,7 +1088,7 @@ func (devices *DeviceSet) setupVerifyBaseImageUUIDFS(baseInfo *devInfo) error {
|
| 1088 | 1088 |
} |
| 1089 | 1089 |
|
| 1090 | 1090 |
if err := devices.verifyBaseDeviceUUIDFS(baseInfo); err != nil {
|
| 1091 |
- return fmt.Errorf("devmapper: Base Device UUID and Filesystem verification failed.%v", err)
|
|
| 1091 |
+ return fmt.Errorf("devmapper: Base Device UUID and Filesystem verification failed: %v", err)
|
|
| 1092 | 1092 |
} |
| 1093 | 1093 |
|
| 1094 | 1094 |
return nil |
| ... | ... |
@@ -181,6 +181,12 @@ func DriverTestCreateEmpty(t *testing.T, drivername string) {
|
| 181 | 181 |
t.Fatal(err) |
| 182 | 182 |
} |
| 183 | 183 |
|
| 184 |
+ defer func() {
|
|
| 185 |
+ if err := driver.Remove("empty"); err != nil {
|
|
| 186 |
+ t.Fatal(err) |
|
| 187 |
+ } |
|
| 188 |
+ }() |
|
| 189 |
+ |
|
| 184 | 190 |
if !driver.Exists("empty") {
|
| 185 | 191 |
t.Fatal("Newly created image doesn't exist")
|
| 186 | 192 |
} |
| ... | ... |
@@ -203,11 +209,6 @@ func DriverTestCreateEmpty(t *testing.T, drivername string) {
|
| 203 | 203 |
} |
| 204 | 204 |
|
| 205 | 205 |
driver.Put("empty")
|
| 206 |
- |
|
| 207 |
- if err := driver.Remove("empty"); err != nil {
|
|
| 208 |
- t.Fatal(err) |
|
| 209 |
- } |
|
| 210 |
- |
|
| 211 | 206 |
} |
| 212 | 207 |
|
| 213 | 208 |
func createBase(t *testing.T, driver graphdriver.Driver, name string) {
|
| ... | ... |
@@ -260,7 +261,6 @@ func verifyBase(t *testing.T, driver graphdriver.Driver, name string) {
|
| 260 | 260 |
if len(fis) != 2 {
|
| 261 | 261 |
t.Fatal("Unexpected files in base image")
|
| 262 | 262 |
} |
| 263 |
- |
|
| 264 | 263 |
} |
| 265 | 264 |
|
| 266 | 265 |
// DriverTestCreateBase create a base driver and verify. |
| ... | ... |
@@ -269,11 +269,12 @@ func DriverTestCreateBase(t *testing.T, drivername string) {
|
| 269 | 269 |
defer PutDriver(t) |
| 270 | 270 |
|
| 271 | 271 |
createBase(t, driver, "Base") |
| 272 |
+ defer func() {
|
|
| 273 |
+ if err := driver.Remove("Base"); err != nil {
|
|
| 274 |
+ t.Fatal(err) |
|
| 275 |
+ } |
|
| 276 |
+ }() |
|
| 272 | 277 |
verifyBase(t, driver, "Base") |
| 273 |
- |
|
| 274 |
- if err := driver.Remove("Base"); err != nil {
|
|
| 275 |
- t.Fatal(err) |
|
| 276 |
- } |
|
| 277 | 278 |
} |
| 278 | 279 |
|
| 279 | 280 |
// DriverTestCreateSnap Create a driver and snap and verify. |
| ... | ... |
@@ -283,17 +284,20 @@ func DriverTestCreateSnap(t *testing.T, drivername string) {
|
| 283 | 283 |
|
| 284 | 284 |
createBase(t, driver, "Base") |
| 285 | 285 |
|
| 286 |
+ defer func() {
|
|
| 287 |
+ if err := driver.Remove("Base"); err != nil {
|
|
| 288 |
+ t.Fatal(err) |
|
| 289 |
+ } |
|
| 290 |
+ }() |
|
| 291 |
+ |
|
| 286 | 292 |
if err := driver.Create("Snap", "Base", "", nil); err != nil {
|
| 287 | 293 |
t.Fatal(err) |
| 288 | 294 |
} |
| 295 |
+ defer func() {
|
|
| 296 |
+ if err := driver.Remove("Snap"); err != nil {
|
|
| 297 |
+ t.Fatal(err) |
|
| 298 |
+ } |
|
| 299 |
+ }() |
|
| 289 | 300 |
|
| 290 | 301 |
verifyBase(t, driver, "Snap") |
| 291 |
- |
|
| 292 |
- if err := driver.Remove("Snap"); err != nil {
|
|
| 293 |
- t.Fatal(err) |
|
| 294 |
- } |
|
| 295 |
- |
|
| 296 |
- if err := driver.Remove("Base"); err != nil {
|
|
| 297 |
- t.Fatal(err) |
|
| 298 |
- } |
|
| 299 | 302 |
} |