From 5dd12ba20a962c0f67e5eefb7b0e00e5caccb1e1 Mon Sep 17 00:00:00 2001
From: Michael Crosby <crosby.michael@gmail.com>
Date: Mon, 14 Oct 2013 14:23:58 -0700
Subject: [PATCH] Ignore cleanup with /dev/mapper does not exist

---
 runtime_test.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/runtime_test.go b/runtime_test.go
index dd670f0ce0..5a5a9c4cb6 100644
--- a/runtime_test.go
+++ b/runtime_test.go
@@ -121,6 +121,10 @@ func cleanupDevMapper() error {
 	// Remove any leftover devmapper devices from previous unit run tests
 	infos, err := ioutil.ReadDir("/dev/mapper")
 	if err != nil {
+		// If the mapper file does not exist there is nothing to clean up
+		if os.IsNotExist(err) {
+			return nil
+		}
 		return err
 	}
 	pools := []string{}
@@ -148,7 +152,7 @@ func init() {
 	os.Setenv("TEST", "1")
 	os.Setenv("DOCKER_LOOPBACK_DATA_SIZE", "209715200") // 200MB
 	os.Setenv("DOCKER_LOOPBACK_META_SIZE", "104857600") // 100MB
-	os.Setenv("DOCKER_BASE_FS_SIZE", "157286400") // 150MB
+	os.Setenv("DOCKER_BASE_FS_SIZE", "157286400")       // 150MB
 
 	// Hack to run sys init during unit testing
 	if selfPath := utils.SelfPath(); selfPath == "/sbin/init" || selfPath == "/.dockerinit" {