fix(tests): use docker run --rm instead of explicitly removing containers

Author: mboersma

builder/tests/builderComponent_test.go

@@ -24,8 +24,9 @@ func runDeisBuilderTest(
 	done <- true
 	go func() {
 		<-done
-		dockercliutils.RunContainer(t, cli, "--name",
-			"deis-builder-"+testSessionUID,
+		dockercliutils.RunContainer(t, cli,
+			"--name", "deis-builder-"+testSessionUID,
+			"--rm",
 			"-p", servicePort+":22",
 			"-e", "PUBLISH=22",
 			"-e", "STORAGE_DRIVER=devicemapper",

cache/tests/cacheComponent_test.go

@@ -18,8 +18,9 @@ func runDeisCacheTest(t *testing.T, testSessionUID string, etcdPort string, serv
 		<-done
 		//docker run --name deis-cache -p 6379:6379 -e PUBLISH=6379
 		// -e HOST=${COREOS_PRIVATE_IPV4} deis/cache
-		dockercliutils.RunContainer(t, cli, "--name",
-			"deis-cache-"+testSessionUID,
+		dockercliutils.RunContainer(t, cli,
+			"--name", "deis-cache-"+testSessionUID,
+			"--rm",
 			"-p", servicePort+":6379",
 			"-e", "PUBLISH="+servicePort,
 			"-e", "HOST="+IPAddress,

controller/tests/controllerComponent_test.go

@@ -21,8 +21,9 @@ func runDeisControllerTest(t *testing.T, testSessionUID string, etcdPort string,
 	done <- true
 	go func() {
 		<-done
-		dockercliutils.RunContainer(t, cli, "--name",
-			"deis-controller-"+testSessionUID,
+		dockercliutils.RunContainer(t, cli,
+			"--name", "deis-controller-"+testSessionUID,
+			"--rm",
 			"-p", servicePort+":8000",
 			"-e", "PUBLISH="+servicePort,
 			"-e", "HOST="+IPAddress,

database/tests/databaseComponent_test.go

@@ -22,8 +22,9 @@ func runDeisDatabaseTest(
 		//docker run --name deis-database -p 5432:5432 -e PUBLISH=5432
 		// -e HOST=${COREOS_PRIVATE_IPV4}
 		// --volumes-from deis-database-data deis/database
-		dockercliutils.RunContainer(t, cli, "--name",
-			"deis-database-"+testSessionUID,
+		dockercliutils.RunContainer(t, cli,
+			"--name", "deis-database-"+testSessionUID,
+			"--rm",
 			"-p", servicePort+":5432",
 			"-e", "PUBLISH="+servicePort,
 			"-e", "HOST="+IPAddress,

logger/tests/loggerComponent_test.go

@@ -21,6 +21,7 @@ func runDeisLoggerTest(
 		<-done
 		dockercliutils.RunContainer(t, cli,
 			"--name", "deis-logger-"+testSessionUID,
+			"--rm",
 			"-p", servicePort+":514/udp",
 			"-e", "PUBLISH="+servicePort,
 			"-e", "HOST="+IPAddress,

registry/tests/registryComponent_test.go

@@ -22,6 +22,7 @@ func runDeisRegistryTest(
 		<-done
 		dockercliutils.RunContainer(t, cli,
 			"--name", "deis-registry-"+testSessionUID,
+			"--rm",
 			"-p", servicePort+":5000",
 			"-e", "PUBLISH="+servicePort,
 			"-e", "HOST="+IPAddress,

router/tests/routerComponent_test.go

@@ -24,6 +24,7 @@ func runDeisRouterTest(
 		<-done
 		dockercliutils.RunContainer(t, cli,
 			"--name", "deis-router-"+testSessionID,
+			"--rm",
 			"-p", servicePort+":80",
 			"-p", "2222:2222",
 			"-e", "PUBLISH="+servicePort,

tests/dockercliutils/dockercliutils.go

@@ -266,24 +266,13 @@ func getImageIds(t *testing.T, uid string) []string {
 	return sliceImageids
 }
 
-func stopRmContainers(t *testing.T, sliceContainerIds []string) {
+func stopContainers(t *testing.T, sliceContainerIds []string) {
 	cli, stdout, stdoutPipe := GetNewClient()
-	done := make(chan bool, 1)
 	go func() {
 		for _, value := range sliceContainerIds {
 			err := cli.CmdStop(value)
 			if err != nil {
-				t.Fatalf("stop Container %s", err)
-			}
-		}
-		done <- true
-	}()
-	go func() {
-		<-done
-		for _, value := range sliceContainerIds {
-			err := cli.CmdRm(value)
-			if err != nil {
-				t.Fatalf("stop Container %s", err)
+				t.Log("stop container failed:", err)
 			}
 		}
 		if err := CloseWrap(stdout, stdoutPipe); err != nil {
@@ -313,13 +302,14 @@ func removeImages(t *testing.T, sliceImageIds []string) {
 
 // ClearTestSession cleans up after a typical test session.
 func ClearTestSession(t *testing.T, uid string) {
+	fmt.Println("clearing test session", uid)
 	sliceContainerIds := getContainerIds(t, uid)
-	sliceImageids := getImageIds(t, uid)
-	//fmt.Println(sliceContainerIds)
-	//fmt.Println(sliceImageids)
-	fmt.Println("removing containers and images for the test session " + uid)
-	stopRmContainers(t, sliceContainerIds)
-	removeImages(t, sliceImageids)
+	// sliceImageids := getImageIds(t, uid)
+	// //fmt.Println(sliceContainerIds)
+	// //fmt.Println(sliceImageids)
+	// fmt.Println("removing containers and images for the test session " + uid)
+	stopContainers(t, sliceContainerIds)
+	// removeImages(t, sliceImageids)
 }
 
 // GetImageID returns the ID of a docker image.
@@ -353,6 +343,7 @@ func RunEtcdTest(t *testing.T, uid string, port string) {
 		done2 <- true
 		RunContainer(t, cli,
 			"--name", "deis-etcd-"+uid,
+			"--rm",
 			"-p", port+":"+port,
 			"-e", "HOST_IP="+IPAddress,
 			"-e", "ETCD_ADDR="+IPAddress+":"+port,

tests/mockserviceutils/mockserviceutils.go

@@ -27,6 +27,7 @@ func RunMockDatabase(t *testing.T, uid string, etcdPort string, dbPort string) {
 		cli.CmdTag(imageID, imageTag)
 		dockercliutils.RunContainer(t, cli,
 			"--name", "deis-test-database-"+uid,
+			"--rm",
 			"-p", dbPort+":5432",
 			"-e", "PUBLISH="+dbPort,
 			"-e", "HOST="+IPAddress,