fix(tests): randomize test-database TCP port

Author: mboersma

builder/Makefile

@@ -33,6 +33,6 @@ test-unit:
 	@echo no unit tests
 
 test-functional:
-	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
+	GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v -timeout 15m ./tests/...
 
 .PHONY: test

controller/tests/controllerComponent_test.go

@@ -49,11 +49,12 @@ func TestBuild(t *testing.T) {
 	fmt.Println("UUID for the session Controller Test :" + testSessionUID)
 	etcdPort := utils.GetRandomPort()
 	servicePort := utils.GetRandomPort()
+	dbPort := utils.GetRandomPort()
 	dockercliutils.RunEtcdTest(t, testSessionUID, etcdPort)
 	fmt.Println("starting controller test:")
 	Controllerhandler := etcdutils.InitetcdValues(setdir, setkeys, etcdPort)
 	etcdutils.Publishvalues(t, Controllerhandler)
-	mockserviceutils.RunMockDatabase(t, testSessionUID, etcdPort)
+	mockserviceutils.RunMockDatabase(t, testSessionUID, etcdPort, dbPort)
 	fmt.Println("starting Controller component test")
 	runDeisControllerTest(t, testSessionUID, etcdPort, servicePort)
 	dockercliutils.DeisServiceTest(

tests/mockserviceutils/mockserviceutils.go

@@ -11,7 +11,7 @@ import (
 )
 
 // RunMockDatabase starts a mock postgresql database for testing.
-func RunMockDatabase(t *testing.T, uid string, port string) {
+func RunMockDatabase(t *testing.T, uid string, etcdPort string, dbPort string) {
 	cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
 	done := make(chan bool, 1)
 	var imageID string
@@ -23,19 +23,30 @@ func RunMockDatabase(t *testing.T, uid string, port string) {
 		<-done
 		dockercliutils.PullImage(t, cli, "paintedfox/postgresql")
 		imageID = dockercliutils.GetImageID(t, "paintedfox/postgresql")
-		imageTag = "deis/database:" + uid
+		imageTag = "deis/test-database:" + uid
 		cli.CmdTag(imageID, imageTag)
-		dockercliutils.RunContainer(t, cli, "--name", "deis-database-"+uid, "-p", "5432:5432", "-e", "PUBLISH=5432", "-e", "HOST="+IPAddress, "-e", "USER=deis", "-e", "DB=deis", "-e", "PASS=deis", "deis/database:"+uid)
+		dockercliutils.RunContainer(t, cli,
+			"--name", "deis-test-database-"+uid,
+			"-p", dbPort+":5432",
+			"-e", "PUBLISH="+dbPort,
+			"-e", "HOST="+IPAddress,
+			"-e", "USER=deis",
+			"-e", "DB=deis",
+			"-e", "PASS=deis",
+			"deis/test-database:"+uid)
 	}()
 	time.Sleep(1000 * time.Millisecond)
 	dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "Starting")
-	// docker run --name="deis-database"  -p -e PUBLISH=5432 -e HOST=172.17.8.100 -e USER="super" -e DB="deis" -e PASS="jaffa"  deis/database
+	// docker run --name="deis-database"  -p -e PUBLISH=5432
+	// -e HOST=172.17.8.100 -e USER="super" -e DB="deis"
+	// -e PASS="jaffa"  deis/database
 	setkeys := []string{"/deis/database/user",
 		"/deis/database/password",
 		"/deis/database/name"}
 	setdir := []string{}
-	dbhandler := etcdutils.InitetcdValues(setdir, setkeys, port)
+	dbhandler := etcdutils.InitetcdValues(setdir, setkeys, etcdPort)
 	etcdutils.Publishvalues(t, dbhandler)
-	IPAddress = dockercliutils.GetInspectData(t, "{{ .NetworkSettings.IPAddress }}", "deis-database-"+uid)
-	etcdutils.SetEtcdValues(t, []string{"/deis/database/host", "/deis/database/port", "/deis/database/engine"}, []string{IPAddress, "5432", "postgresql_psycopg2"}, dbhandler.C)
+	etcdutils.SetEtcdValues(t,
+		[]string{"/deis/database/host", "/deis/database/port", "/deis/database/engine"},
+		[]string{IPAddress, dbPort, "postgresql_psycopg2"}, dbhandler.C)
 }