From 7b58e15b08349dba35bf3813f77a0b900c2e4df5 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 3 Oct 2013 19:54:14 +0200
Subject: [PATCH] Be better at cleaning up leftover from earlier test runs

When running the test inside a docker container we sometimes are left with
leftover device nodes for device mapper devices that no longer exist.
We were panic:ing in this case, but with this change we just remove such
nodes.
---
 runtime_test.go | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/runtime_test.go b/runtime_test.go
index 0a9b95a411..7c12832e30 100644
--- a/runtime_test.go
+++ b/runtime_test.go
@@ -10,6 +10,7 @@ import (
 	"log"
 	"net"
 	"os"
+	"path/filepath"
 	"runtime"
 	"strconv"
 	"strings"
@@ -85,6 +86,23 @@ func layerArchive(tarfile string) (io.Reader, error) {
 }
 
 // Remove any leftover device mapper devices from earlier runs of the unit tests
+func removeDev(name string) {
+	path := filepath.Join("/dev/mapper", name)
+	fd, err := syscall.Open(path, syscall.O_RDONLY, 07777)
+	if err != nil {
+		if err == syscall.ENXIO {
+			// No device for this node, just remove it
+			os.Remove(path)
+			return
+		}
+	} else {
+		syscall.Close(fd)
+	}
+	if err := devmapper.RemoveDevice(name); err != nil {
+		panic(fmt.Errorf("Unable to remove existing device %s: %s", name, err))
+	}
+}
+
 func cleanupDevMapper() {
 	infos, _ := ioutil.ReadDir("/dev/mapper")
 	if infos != nil {
@@ -95,16 +113,12 @@ func cleanupDevMapper() {
 				if name == "docker-unit-tests-devices-pool" {
 					hasPool = true
 				} else {
-					if err := devmapper.RemoveDevice(name); err != nil {
-						panic(fmt.Errorf("Unable to remove existing device %s: %s", name, err))
-					}
+					removeDev(name)
 				}
 			}
 			// We need to remove the pool last as the other devices block it
 			if hasPool {
-				if err := devmapper.RemoveDevice("docker-unit-tests-devices-pool"); err != nil {
-					panic(fmt.Errorf("Unable to remove existing device docker-unit-tests-devices-pool: %s", name, err))
-				}
+				removeDev("docker-unit-tests-devices-pool")
 			}
 		}
 	}