fix(tests): randomize test port for each service

Author: mboersma

Makefile

@@ -52,6 +52,6 @@ test-unit:
 	venv/bin/python manage.py test --noinput api
 
 test-functional:
-	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -timeout 7m -v ./tests/...
+	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
 
 .PHONY: test

tests/controllerComponent_test.go

@@ -11,19 +11,23 @@ import (
 	"github.com/deis/deis/tests/utils"
 )
 
-func runDeisControllerTest(t *testing.T, testSessionUID string, port string) {
+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
+	//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()
 	done <- true
 	go func() {
 		<-done
 		dockercliutils.RunContainer(t, cli, "--name",
-			"deis-controller-"+testSessionUID, "-p", "8000:8000",
-			"-e", "PUBLISH=8000", "-e", "HOST="+IPAddress,
-			"-e", "ETCD_PORT="+port, "deis/controller:"+testSessionUID)
+			"deis-controller-"+testSessionUID,
+			"-p", servicePort+":8000",
+			"-e", "PUBLISH="+servicePort,
+			"-e", "HOST="+IPAddress,
+			"-e", "ETCD_PORT="+etcdPort,
+			"deis/controller:"+testSessionUID)
 	}()
 	time.Sleep(5000 * time.Millisecond)
 	dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "Booting")
@@ -43,16 +47,16 @@ func TestBuild(t *testing.T) {
 		"/deis/domains"}
 	var testSessionUID = utils.NewUuid()
 	fmt.Println("UUID for the session Controller Test :" + testSessionUID)
-	port := utils.GetRandomPort()
-	//testSessionUID := "352aea64"
-	dockercliutils.RunEtcdTest(t, testSessionUID, port)
+	etcdPort := utils.GetRandomPort()
+	servicePort := utils.GetRandomPort()
+	dockercliutils.RunEtcdTest(t, testSessionUID, etcdPort)
 	fmt.Println("starting controller test:")
-	Controllerhandler := etcdutils.InitetcdValues(setdir, setkeys, port)
+	Controllerhandler := etcdutils.InitetcdValues(setdir, setkeys, etcdPort)
 	etcdutils.Publishvalues(t, Controllerhandler)
-	mockserviceutils.RunMockDatabase(t, testSessionUID, port)
+	mockserviceutils.RunMockDatabase(t, testSessionUID, etcdPort)
 	fmt.Println("starting Controller component test")
-	runDeisControllerTest(t, testSessionUID, port)
+	runDeisControllerTest(t, testSessionUID, etcdPort, servicePort)
 	dockercliutils.DeisServiceTest(
-		t, "deis-controller-"+testSessionUID, "8000", "http")
+		t, "deis-controller-"+testSessionUID, servicePort, "http")
 	dockercliutils.ClearTestSession(t, testSessionUID)
 }