fix(tests): report errors from docker pull on main goroutine

See http://golang.org/pkg/testing/#T.FailNow

Author: mboersma

builder/tests/builderComponent_test.go builder/tests/builder_test.gobuilder/tests/builderComponent_test.go renamed to builder/tests/builder_test.go

@@ -14,33 +14,39 @@ func runDeisBuilderTest(
 	t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
 	cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
 	done := make(chan bool, 1)
-	dockercliutils.BuildDockerfile(t, "../", "deis/builder:"+testSessionUID)
+	err := dockercliutils.BuildImage(t, "../", "deis/builder:"+testSessionUID)
+	if err != nil {
+		t.Fatal(err)
+	}
 	dockercliutils.RunDeisDataTest(t, "--name", "deis-builder-data",
 		"-v", "/var/lib/docker", "deis/base", "/bin/true")
 	//docker run --name deis-builder -p 2223:22 -e PUBLISH=22
 	// -e HOST=${COREOS_PRIVATE_IPV4} -e PORT=2223
 	// --volumes-from deis-builder-data --privileged deis/builder
-	IPAddress := utils.GetHostIPAddress()
+	ipaddr := utils.GetHostIPAddress()
 	done <- true
 	go func() {
 		<-done
-		dockercliutils.RunContainer(t, cli,
+		err = dockercliutils.RunContainer(cli,
 			"--name", "deis-builder-"+testSessionUID,
 			"--rm",
 			"-p", servicePort+":22",
 			"-e", "PUBLISH=22",
 			"-e", "STORAGE_DRIVER=devicemapper",
-			"-e", "HOST="+IPAddress,
+			"-e", "HOST="+ipaddr,
 			"-e", "ETCD_PORT="+etcdPort,
 			"-e", "PORT="+servicePort,
 			"--volumes-from", "deis-builder-data",
 			"--privileged", "deis/builder:"+testSessionUID)
 	}()
 	time.Sleep(5000 * time.Millisecond)
 	dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "deis-builder running")
+	if err != nil {
+		t.Fatal(err)
+	}
 }
 
-func TestBuild(t *testing.T) {
+func TestBuilder(t *testing.T) {
 	setkeys := []string{"/deis/registry/protocol",
 		"deis/registry/host",
 		"/deis/registry/port",

cache/tests/cacheComponent_test.go cache/tests/cache_test.gocache/tests/cacheComponent_test.go renamed to cache/tests/cache_test.go

@@ -11,26 +11,30 @@ import (
 func runDeisCacheTest(t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
 	cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
 	done := make(chan bool, 1)
-	dockercliutils.BuildDockerfile(t, "../", "deis/cache:"+testSessionUID)
-	IPAddress := utils.GetHostIPAddress()
+	err := dockercliutils.BuildImage(t, "../", "deis/cache:"+testSessionUID)
+	if err != nil {
+		t.Fatal(err)
+	}
+	ipaddr := utils.GetHostIPAddress()
 	done <- true
 	go func() {
 		<-done
-		//docker run --name deis-cache -p 6379:6379 -e PUBLISH=6379
-		// -e HOST=${COREOS_PRIVATE_IPV4} deis/cache
-		dockercliutils.RunContainer(t, cli,
+		err = dockercliutils.RunContainer(cli,
 			"--name", "deis-cache-"+testSessionUID,
 			"--rm",
 			"-p", servicePort+":6379",
 			"-e", "PUBLISH="+servicePort,
-			"-e", "HOST="+IPAddress,
+			"-e", "HOST="+ipaddr,
 			"-e", "ETCD_PORT="+etcdPort,
 			"deis/cache:"+testSessionUID)
 	}()
 	dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "started")
+	if err != nil {
+		t.Fatal(err)
+	}
 }
 
-func TestBuild(t *testing.T) {
+func TestCache(t *testing.T) {
 	var testSessionUID = utils.NewUuid()
 	fmt.Println("UUID for the session Cache Test :" + testSessionUID)
 	etcdPort := utils.GetRandomPort()

…roller/tests/controllerComponent_test.go controller/tests/controller_test.gocontroller/tests/controllerComponent_test.go renamed to controller/tests/controller_test.go controller/tests/controllerComponent_test.go renamed to controller/tests/controller_test.go

@@ -14,28 +14,31 @@ import (
 func runDeisControllerTest(t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
 	cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
 	done := make(chan bool, 1)
-	dockercliutils.BuildDockerfile(t, "../", "deis/controller:"+testSessionUID)
-	//docker run --name deis-controller -p 8000:8000 -e PUBLISH=8000
-	// -e HOST=${COREOS_PRIVATE_IPV4} --volumes-from=deis-logger deis/controller
-	IPAddress := utils.GetHostIPAddress()
+	err := dockercliutils.BuildImage(t, "../", "deis/controller:"+testSessionUID)
+	if err != nil {
+		t.Fatal(err)
+	}
+	ipaddr := utils.GetHostIPAddress()
 	done <- true
 	go func() {
 		<-done
-		dockercliutils.RunContainer(t, cli,
+		err = dockercliutils.RunContainer(cli,
 			"--name", "deis-controller-"+testSessionUID,
 			"--rm",
 			"-p", servicePort+":8000",
 			"-e", "PUBLISH="+servicePort,
-			"-e", "HOST="+IPAddress,
+			"-e", "HOST="+ipaddr,
 			"-e", "ETCD_PORT="+etcdPort,
 			"deis/controller:"+testSessionUID)
 	}()
 	time.Sleep(5000 * time.Millisecond)
 	dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "Booting")
-
+	if err != nil {
+		t.Fatal(err)
+	}
 }
 
-func TestBuild(t *testing.T) {
+func TestController(t *testing.T) {
 	setkeys := []string{"/deis/registry/protocol",
 		"deis/registry/host",
 		"/deis/registry/port",

database/tests/databaseComponent_test.go database/tests/database_test.godatabase/tests/databaseComponent_test.go renamed to database/tests/database_test.go

@@ -12,30 +12,36 @@ func runDeisDatabaseTest(
 	t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
 	cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
 	done := make(chan bool, 1)
-	dockercliutils.BuildDockerfile(t, "../", "deis/database:"+testSessionUID)
+	err := dockercliutils.BuildImage(t, "../", "deis/database:"+testSessionUID)
+	if err != nil {
+		t.Fatal(err)
+	}
 	dockercliutils.RunDeisDataTest(t, "--name", "deis-database-data",
 		"-v", "/var/lib/postgresql", "deis/base", "true")
-	IPAddress := utils.GetHostIPAddress()
+	ipaddr := utils.GetHostIPAddress()
 	done <- true
 	go func() {
 		<-done
 		//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,
+		err = dockercliutils.RunContainer(cli,
 			"--name", "deis-database-"+testSessionUID,
 			"--rm",
 			"-p", servicePort+":5432",
 			"-e", "PUBLISH="+servicePort,
-			"-e", "HOST="+IPAddress,
+			"-e", "HOST="+ipaddr,
 			"-e", "ETCD_PORT="+etcdPort,
 			"--volumes-from", "deis-database-data",
 			"deis/database:"+testSessionUID)
 	}()
 	dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "deis-database running")
+	if err != nil {
+		t.Fatal(err)
+	}
 }
 
-func TestBuild(t *testing.T) {
+func TestDatabase(t *testing.T) {
 	var testSessionUID = utils.NewUuid()
 	fmt.Println("UUID for the session Cache Test :" + testSessionUID)
 	etcdPort := utils.GetRandomPort()

logger/tests/loggerComponent_test.go logger/tests/logger_test.gologger/tests/loggerComponent_test.go renamed to logger/tests/logger_test.go

@@ -12,27 +12,33 @@ func runDeisLoggerTest(
 	t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
 	cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
 	done := make(chan bool, 1)
-	dockercliutils.BuildDockerfile(t, "../", "deis/logger:"+testSessionUID)
+	err := dockercliutils.BuildImage(t, "../", "deis/logger:"+testSessionUID)
+	if err != nil {
+		t.Fatal(err)
+	}
 	dockercliutils.RunDeisDataTest(t, "--name", "deis-logger-data",
 		"-v", "/var/log/deis", "deis/base", "true")
-	IPAddress := utils.GetHostIPAddress()
+	ipaddr := utils.GetHostIPAddress()
 	done <- true
 	go func() {
 		<-done
-		dockercliutils.RunContainer(t, cli,
+		err = dockercliutils.RunContainer(cli,
 			"--name", "deis-logger-"+testSessionUID,
 			"--rm",
 			"-p", servicePort+":514/udp",
 			"-e", "PUBLISH="+servicePort,
-			"-e", "HOST="+IPAddress,
+			"-e", "HOST="+ipaddr,
 			"-e", "ETCD_PORT="+etcdPort,
 			"--volumes-from", "deis-logger-data",
 			"deis/logger:"+testSessionUID)
 	}()
 	dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "deis-logger running")
+	if err != nil {
+		t.Fatal(err)
+	}
 }
 
-func TestBuild(t *testing.T) {
+func TestLogger(t *testing.T) {
 	var testSessionUID = utils.NewUuid()
 	etcdPort := utils.GetRandomPort()
 	servicePort := utils.GetRandomPort()

registry/tests/registryComponent_test.go registry/tests/registry_test.goregistry/tests/registryComponent_test.go renamed to registry/tests/registry_test.go

@@ -13,28 +13,34 @@ func runDeisRegistryTest(
 	t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
 	cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
 	done := make(chan bool, 1)
-	dockercliutils.BuildDockerfile(t, "../", "deis/registry:"+testSessionUID)
+	err := dockercliutils.BuildImage(t, "../", "deis/registry:"+testSessionUID)
+	if err != nil {
+		t.Fatal(err)
+	}
 	dockercliutils.RunDeisDataTest(t, "--name", "deis-registry-data",
 		"-v", "/data", "deis/base", "/bin/true")
-	IPAddress := utils.GetHostIPAddress()
+	ipaddr := utils.GetHostIPAddress()
 	done <- true
 	go func() {
 		<-done
-		dockercliutils.RunContainer(t, cli,
+		err = dockercliutils.RunContainer(cli,
 			"--name", "deis-registry-"+testSessionUID,
 			"--rm",
 			"-p", servicePort+":5000",
 			"-e", "PUBLISH="+servicePort,
-			"-e", "HOST="+IPAddress,
+			"-e", "HOST="+ipaddr,
 			"-e", "ETCD_PORT="+etcdPort,
 			"--volumes-from", "deis-registry-data",
 			"deis/registry:"+testSessionUID)
 	}()
 	time.Sleep(2000 * time.Millisecond)
 	dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "Booting")
+	if err != nil {
+		t.Fatal(err)
+	}
 }
 
-func TestBuild(t *testing.T) {
+func TestRegistry(t *testing.T) {
 	var testSessionUID = utils.NewUuid()
 	fmt.Println("UUID for the session registry Test :" + testSessionUID)
 	etcdPort := utils.GetRandomPort()

router/tests/routerComponent_test.go router/tests/router_test.gorouter/tests/routerComponent_test.go renamed to router/tests/router_test.go

@@ -14,29 +14,32 @@ func runDeisRouterTest(
 	t *testing.T, testSessionID string, etcdPort string, servicePort string) {
 	cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
 	done := make(chan bool, 1)
-	dockercliutils.BuildDockerfile(t, "../", "deis/router:"+testSessionID)
-
-	//ocker run --name deis-router -p 80:80 -p 2222:2222 -e PUBLISH=80
-	// -e HOST=${COREOS_PRIVATE_IPV4} deis/router
-	IPAddress := utils.GetHostIPAddress()
+	err := dockercliutils.BuildImage(t, "../", "deis/router:"+testSessionID)
+	if err != nil {
+		t.Fatal(err)
+	}
+	ipaddr := utils.GetHostIPAddress()
 	done <- true
 	go func() {
 		<-done
-		dockercliutils.RunContainer(t, cli,
+		err = dockercliutils.RunContainer(cli,
 			"--name", "deis-router-"+testSessionID,
 			"--rm",
 			"-p", servicePort+":80",
 			"-p", "2222:2222",
 			"-e", "PUBLISH="+servicePort,
-			"-e", "HOST="+IPAddress,
+			"-e", "HOST="+ipaddr,
 			"-e", "ETCD_PORT="+etcdPort,
 			"deis/router:"+testSessionID)
 	}()
 	time.Sleep(2000 * time.Millisecond)
 	dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "deis-router running")
+	if err != nil {
+		t.Fatal(err)
+	}
 }
 
-func TestBuild(t *testing.T) {
+func TestRouter(t *testing.T) {
 	setkeys := []string{"deis/controller/host",
 		"/deis/controller/port",
 		"/deis/builder/host",