fix(tests): improve functional test setup logic

mboersma · Gabriel Monroy · commit 22202712e863 · 2014-09-21T09:08:52.000-06:00
diff --git a/Makefile b/Makefile
@@ -19,25 +19,25 @@ discovery-url:
 	sed -i .orig -e "s,# discovery: https://discovery.etcd.io/12345693838asdfasfadf13939923,discovery: $$(curl -q -w '\n' https://discovery.etcd.io/new)," contrib/coreos/user-data
 
 build: check-docker
-	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) build ;)
+	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) build || exit 1;)
 
 push: check-docker check-registry
-	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) push ;)
-
+	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) push || exit 1;)
+	
 full-clean:
-	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) full-clean ;)
+	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) full-clean || exit 1;)
 
 install:
-	@$(foreach C, $(START_ORDER), $(MAKE) -C $(C) install ;)
+	@$(foreach C, $(START_ORDER), $(MAKE) -C $(C) install || exit 1;)
 
 uninstall:
-	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) uninstall ;)
+	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) uninstall || exit 1;)
 
 start:
-	@$(foreach C, $(START_ORDER), $(MAKE) -C $(C) start ;)
+	@$(foreach C, $(START_ORDER), $(MAKE) -C $(C) start || exit 1;)
 
 stop:
-	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) stop ;)
+	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) stop || exit 1;)
 
 restart: stop start
 
diff --git a/builder/Makefile b/builder/Makefile
@@ -40,5 +40,5 @@ test-unit:
 	@echo no unit tests
 
 test-functional:
-	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd
-	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v -timeout 30m ./tests/...
+	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
+	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
diff --git a/cache/Makefile b/cache/Makefile
@@ -38,5 +38,5 @@ test-unit:
 	@echo no unit tests
 
 test-functional:
-	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd
-	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v -timeout 20m ./tests/...
+	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
+	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
diff --git a/controller/Makefile b/controller/Makefile
@@ -59,6 +59,6 @@ test-unit: setup-venv test-style
 	venv/bin/python manage.py test --noinput api
 
 test-functional:
-	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd
-	@docker history deis/test-postgresql >/dev/null 2>&1 || docker pull deis/test-postgresql
-	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v -timeout 20m ./tests/...
+	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
+	@docker history deis/test-postgresql >/dev/null 2>&1 || docker pull deis/test-postgresql:latest
+	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
diff --git a/controller/tests/controller_test.go b/controller/tests/controller_test.go
@@ -33,7 +33,6 @@ func TestController(t *testing.T) {
 	defer cli.CmdRm("-f", etcdName)
 	handler := etcdutils.InitEtcd(setdir, setkeys, etcdPort)
 	etcdutils.PublishEtcd(t, handler)
-	cli.CmdRm("-f", "deis-test-database-"+tag)
 	mock.RunMockDatabase(t, tag, etcdPort, utils.RandomPort())
 	defer cli.CmdRm("-f", "deis-test-database-"+tag)
 	host, port := utils.HostAddress(), utils.RandomPort()
diff --git a/database/Makefile b/database/Makefile
@@ -40,5 +40,5 @@ test-unit:
 	@echo no unit tests
 
 test-functional:
-	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd
-	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v -timeout 20m ./tests/...
+	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
+	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
diff --git a/logger/Makefile b/logger/Makefile
@@ -52,8 +52,8 @@ test-unit: test-style
 	go test -v -cover ./syslog
 
 test-functional:
-	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd
-	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v -timeout 20m ./tests/...
+	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
+	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
 
 coverage:
 	go test -coverprofile coverage.out ./syslog
diff --git a/registry/Makefile b/registry/Makefile
@@ -40,4 +40,5 @@ test-unit:
 	@echo no unit tests
 
 test-functional:
-	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v -timeout 20m ./tests/...
+	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
+	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
diff --git a/router/Makefile b/router/Makefile
@@ -38,4 +38,5 @@ test-unit:
 	@echo no unit tests
 
 test-functional:
-	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v -timeout 20m ./tests/...
+	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
+	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
diff --git a/router/tests/router_test.go b/router/tests/router_test.go
@@ -36,14 +36,13 @@ func TestRouter(t *testing.T) {
 	host, port := utils.HostAddress(), utils.RandomPort()
 	fmt.Printf("--- Run deis/router:%s at %s:%s\n", tag, host, port)
 	name := "deis-router-" + tag
-	defer cli.CmdRm("-f", name)
 	go func() {
 		_ = cli.CmdRm("-f", name)
 		err = dockercli.RunContainer(cli,
 			"--name", name,
 			"--rm",
 			"-p", port+":80",
-			"-p", "2222:2222",
+			"-p", utils.RandomPort()+":2222",
 			"-e", "PUBLISH="+port,
 			"-e", "HOST="+host,
 			"-e", "ETCD_PORT="+etcdPort,
@@ -53,7 +52,8 @@ func TestRouter(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	// TODO: nginx needs a few seconds to wake up here--fixme!
-	time.Sleep(5000 * time.Millisecond)
+	// FIXME: nginx needs a couple seconds to wake up here
+	time.Sleep(2000 * time.Millisecond)
 	dockercli.DeisServiceTest(t, name, port, "http")
+	_ = cli.CmdRm("-f", name)
 }
diff --git a/tests/dockercli/dockercli.go b/tests/dockercli/dockercli.go
@@ -77,6 +77,9 @@ func DockerHost() (string, string, error) {
 	if err != nil {
 		return "", "", err
 	}
+	if u.Scheme == "unix" {
+		return u.Scheme, u.Path, nil
+	}
 	return u.Scheme, u.Host, nil
 }
 
diff --git a/tests/mock/mock.go b/tests/mock/mock.go
@@ -12,7 +12,7 @@ import (
 )
 
 // RunMockDatabase starts a mock postgresql database for testing.
-func RunMockDatabase(t *testing.T, uid string, etcdPort string, dbPort string) {
+func RunMockDatabase(t *testing.T, tag string, etcdPort string, dbPort string) {
 	var err error
 	cli, stdout, stdoutPipe := dockercli.NewClient()
 	done := make(chan bool, 1)
@@ -22,7 +22,7 @@ func RunMockDatabase(t *testing.T, uid string, etcdPort string, dbPort string) {
 	go func() {
 		<-done
 		err = dockercli.RunContainer(cli,
-			"--name", "deis-test-database-"+uid,
+			"--name", "deis-test-database-"+tag,
 			"--rm",
 			"-p", dbPort+":5432",
 			"-e", "PUBLISH="+dbPort,
