Skip to content

Commit 44e76f4

Browse files
mboersmamboersma
committed
fix(tests): randomize test port for each service
1 parent c331def commit 44e76f4

15 files changed

Lines changed: 126 additions & 82 deletions

File tree

‎builder/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ test-unit:
3333
@echo no unit tests
3434

3535
test-functional:
36-
GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -timeout 7m -v ./tests/...
36+
GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
3737

3838
.PHONY: test

‎builder/tests/builderComponent_test.go‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,30 @@ import (
1010
"github.com/deis/deis/tests/utils"
1111
)
1212

13-
func runDeisBuilderTest(t *testing.T, testSessionUID string, port string) {
13+
func runDeisBuilderTest(
14+
t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
1415
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
1516
done := make(chan bool, 1)
1617
dockercliutils.BuildDockerfile(t, "../", "deis/builder:"+testSessionUID)
1718
dockercliutils.RunDeisDataTest(t, "--name", "deis-builder-data",
1819
"-v", "/var/lib/docker", "deis/base", "/bin/true")
19-
//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
20+
//docker run --name deis-builder -p 2223:22 -e PUBLISH=22
21+
// -e HOST=${COREOS_PRIVATE_IPV4} -e PORT=2223
22+
// --volumes-from deis-builder-data --privileged deis/builder
2023
IPAddress := utils.GetHostIPAddress()
2124
done <- true
2225
go func() {
2326
<-done
2427
dockercliutils.RunContainer(t, cli, "--name",
25-
"deis-builder-"+testSessionUID, "-p", "2223:22", "-e", "PUBLISH=22",
26-
"-e", "STORAGE_DRIVER=aufs", "-e", "HOST="+IPAddress, "-e",
27-
"ETCD_PORT="+port, "-e", "PORT=2223", "--volumes-from",
28-
"deis-builder-data", "--privileged", "deis/builder:"+testSessionUID)
28+
"deis-builder-"+testSessionUID,
29+
"-p", servicePort+":22",
30+
"-e", "PUBLISH=22",
31+
"-e", "STORAGE_DRIVER=aufs",
32+
"-e", "HOST="+IPAddress,
33+
"-e", "ETCD_PORT="+etcdPort,
34+
"-e", "PORT="+servicePort,
35+
"--volumes-from", "deis-builder-data",
36+
"--privileged", "deis/builder:"+testSessionUID)
2937
}()
3038
time.Sleep(5000 * time.Millisecond)
3139
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "deis-builder running")
@@ -44,14 +52,16 @@ func TestBuild(t *testing.T) {
4452
"/deis/domains"}
4553
var testSessionUID = utils.NewUuid()
4654
fmt.Println("UUID for the session Builder Test :" + testSessionUID)
47-
port := utils.GetRandomPort()
48-
//testSessionUID := "352aea64"
49-
dockercliutils.RunEtcdTest(t, testSessionUID, port)
50-
Builderhandler := etcdutils.InitetcdValues(setdir, setkeys, port)
55+
etcdPort := utils.GetRandomPort()
56+
servicePort := utils.GetRandomPort()
57+
dockercliutils.RunEtcdTest(t, testSessionUID, etcdPort)
58+
Builderhandler := etcdutils.InitetcdValues(setdir, setkeys, etcdPort)
5159
etcdutils.Publishvalues(t, Builderhandler)
5260
fmt.Println("starting Builder Component test")
53-
runDeisBuilderTest(t, testSessionUID, port)
61+
runDeisBuilderTest(t, testSessionUID, etcdPort, servicePort)
62+
// TODO: builder needs a few seconds to wake up here--fixme!
63+
time.Sleep(5000 * time.Millisecond)
5464
dockercliutils.DeisServiceTest(
55-
t, "deis-builder-"+testSessionUID, "22", "tcp")
65+
t, "deis-builder-"+testSessionUID, servicePort, "tcp")
5666
dockercliutils.ClearTestSession(t, testSessionUID)
5767
}

‎cache/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ test-unit:
3333
@echo no unit tests
3434

3535
test-functional:
36-
GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -timeout 7m -v ./tests/...
36+
GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
3737

3838
.PHONY: test

‎cache/tests/cacheComponent_test.go‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,22 @@ import (
88
"github.com/deis/deis/tests/utils"
99
)
1010

11-
func runDeisCacheTest(t *testing.T, testSessionUID string, port string) {
11+
func runDeisCacheTest(t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
1212
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
1313
done := make(chan bool, 1)
1414
dockercliutils.BuildDockerfile(t, "../", "deis/cache:"+testSessionUID)
1515
IPAddress := utils.GetHostIPAddress()
1616
done <- true
1717
go func() {
1818
<-done
19-
//docker run --name deis-cache -p 6379:6379 -e PUBLISH=6379 -e HOST=${COREOS_PRIVATE_IPV4} deis/cache
19+
//docker run --name deis-cache -p 6379:6379 -e PUBLISH=6379
20+
// -e HOST=${COREOS_PRIVATE_IPV4} deis/cache
2021
dockercliutils.RunContainer(t, cli, "--name",
21-
"deis-cache-"+testSessionUID, "-p", "6379:6379", "-e",
22-
"PUBLISH=6379", "-e", "HOST="+IPAddress, "-e", "ETCD_PORT="+port,
22+
"deis-cache-"+testSessionUID,
23+
"-p", servicePort+":6379",
24+
"-e", "PUBLISH="+servicePort,
25+
"-e", "HOST="+IPAddress,
26+
"-e", "ETCD_PORT="+etcdPort,
2327
"deis/cache:"+testSessionUID)
2428
}()
2529
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "started")
@@ -28,12 +32,12 @@ func runDeisCacheTest(t *testing.T, testSessionUID string, port string) {
2832
func TestBuild(t *testing.T) {
2933
var testSessionUID = utils.NewUuid()
3034
fmt.Println("UUID for the session Cache Test :" + testSessionUID)
31-
port := utils.GetRandomPort()
32-
//testSessionUID := "352aea64"
33-
dockercliutils.RunEtcdTest(t, testSessionUID, port)
34-
fmt.Println("starting cache compotest:")
35-
runDeisCacheTest(t, testSessionUID, port)
35+
etcdPort := utils.GetRandomPort()
36+
servicePort := utils.GetRandomPort()
37+
dockercliutils.RunEtcdTest(t, testSessionUID, etcdPort)
38+
fmt.Println("starting cache component test:")
39+
runDeisCacheTest(t, testSessionUID, etcdPort, servicePort)
3640
dockercliutils.DeisServiceTest(
37-
t, "deis-cache-"+testSessionUID, "6379", "tcp")
41+
t, "deis-cache-"+testSessionUID, servicePort, "tcp")
3842
dockercliutils.ClearTestSession(t, testSessionUID)
3943
}

‎controller/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ test-unit:
5252
venv/bin/python manage.py test --noinput api
5353

5454
test-functional:
55-
GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -timeout 7m -v ./tests/...
55+
GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
5656

5757
.PHONY: test

‎controller/tests/controllerComponent_test.go‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,23 @@ import (
1111
"github.com/deis/deis/tests/utils"
1212
)
1313

14-
func runDeisControllerTest(t *testing.T, testSessionUID string, port string) {
14+
func runDeisControllerTest(t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
1515
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
1616
done := make(chan bool, 1)
1717
dockercliutils.BuildDockerfile(t, "../", "deis/controller:"+testSessionUID)
18-
//docker run --name deis-controller -p 8000:8000 -e PUBLISH=8000 -e HOST=${COREOS_PRIVATE_IPV4} --volumes-from=deis-logger deis/controller
18+
//docker run --name deis-controller -p 8000:8000 -e PUBLISH=8000
19+
// -e HOST=${COREOS_PRIVATE_IPV4} --volumes-from=deis-logger deis/controller
1920
IPAddress := utils.GetHostIPAddress()
2021
done <- true
2122
go func() {
2223
<-done
2324
dockercliutils.RunContainer(t, cli, "--name",
24-
"deis-controller-"+testSessionUID, "-p", "8000:8000",
25-
"-e", "PUBLISH=8000", "-e", "HOST="+IPAddress,
26-
"-e", "ETCD_PORT="+port, "deis/controller:"+testSessionUID)
25+
"deis-controller-"+testSessionUID,
26+
"-p", servicePort+":8000",
27+
"-e", "PUBLISH="+servicePort,
28+
"-e", "HOST="+IPAddress,
29+
"-e", "ETCD_PORT="+etcdPort,
30+
"deis/controller:"+testSessionUID)
2731
}()
2832
time.Sleep(5000 * time.Millisecond)
2933
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "Booting")
@@ -43,16 +47,16 @@ func TestBuild(t *testing.T) {
4347
"/deis/domains"}
4448
var testSessionUID = utils.NewUuid()
4549
fmt.Println("UUID for the session Controller Test :" + testSessionUID)
46-
port := utils.GetRandomPort()
47-
//testSessionUID := "352aea64"
48-
dockercliutils.RunEtcdTest(t, testSessionUID, port)
50+
etcdPort := utils.GetRandomPort()
51+
servicePort := utils.GetRandomPort()
52+
dockercliutils.RunEtcdTest(t, testSessionUID, etcdPort)
4953
fmt.Println("starting controller test:")
50-
Controllerhandler := etcdutils.InitetcdValues(setdir, setkeys, port)
54+
Controllerhandler := etcdutils.InitetcdValues(setdir, setkeys, etcdPort)
5155
etcdutils.Publishvalues(t, Controllerhandler)
52-
mockserviceutils.RunMockDatabase(t, testSessionUID, port)
56+
mockserviceutils.RunMockDatabase(t, testSessionUID, etcdPort)
5357
fmt.Println("starting Controller component test")
54-
runDeisControllerTest(t, testSessionUID, port)
58+
runDeisControllerTest(t, testSessionUID, etcdPort, servicePort)
5559
dockercliutils.DeisServiceTest(
56-
t, "deis-controller-"+testSessionUID, "8000", "http")
60+
t, "deis-controller-"+testSessionUID, servicePort, "http")
5761
dockercliutils.ClearTestSession(t, testSessionUID)
5862
}

‎database/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ test-unit:
3333
@echo no unit tests
3434

3535
test-functional:
36-
GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -timeout 7m -v ./tests/...
36+
GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
3737

3838
.PHONY: test

‎database/tests/databaseComponent_test.go‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import (
88
"github.com/deis/deis/tests/utils"
99
)
1010

11-
func runDeisDatabaseTest(t *testing.T, testSessionUID string, port string) {
11+
func runDeisDatabaseTest(
12+
t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
1213
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
1314
done := make(chan bool, 1)
1415
dockercliutils.BuildDockerfile(t, "../", "deis/database:"+testSessionUID)
@@ -18,11 +19,16 @@ func runDeisDatabaseTest(t *testing.T, testSessionUID string, port string) {
1819
done <- true
1920
go func() {
2021
<-done
21-
//docker run --name deis-database -p 5432:5432 -e PUBLISH=5432 -e HOST=${COREOS_PRIVATE_IPV4} --volumes-from deis-database-data deis/database
22+
//docker run --name deis-database -p 5432:5432 -e PUBLISH=5432
23+
// -e HOST=${COREOS_PRIVATE_IPV4}
24+
// --volumes-from deis-database-data deis/database
2225
dockercliutils.RunContainer(t, cli, "--name",
23-
"deis-database-"+testSessionUID, "-p", "5432:5432",
24-
"-e", "PUBLISH=5432", "-e", "HOST="+IPAddress,
25-
"-e", "ETCD_PORT="+port, "--volumes-from", "deis-database-data",
26+
"deis-database-"+testSessionUID,
27+
"-p", servicePort+":5432",
28+
"-e", "PUBLISH="+servicePort,
29+
"-e", "HOST="+IPAddress,
30+
"-e", "ETCD_PORT="+etcdPort,
31+
"--volumes-from", "deis-database-data",
2632
"deis/database:"+testSessionUID)
2733
}()
2834
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "deis-database running")
@@ -31,11 +37,12 @@ func runDeisDatabaseTest(t *testing.T, testSessionUID string, port string) {
3137
func TestBuild(t *testing.T) {
3238
var testSessionUID = utils.NewUuid()
3339
fmt.Println("UUID for the session Cache Test :" + testSessionUID)
34-
port := utils.GetRandomPort()
35-
dockercliutils.RunEtcdTest(t, testSessionUID, port)
36-
fmt.Println("starting Database compotest:")
37-
runDeisDatabaseTest(t, testSessionUID, port)
40+
etcdPort := utils.GetRandomPort()
41+
servicePort := utils.GetRandomPort()
42+
dockercliutils.RunEtcdTest(t, testSessionUID, etcdPort)
43+
fmt.Println("starting Database component test:")
44+
runDeisDatabaseTest(t, testSessionUID, etcdPort, servicePort)
3845
dockercliutils.DeisServiceTest(
39-
t, "deis-database-"+testSessionUID, "5432", "tcp")
46+
t, "deis-database-"+testSessionUID, servicePort, "tcp")
4047
dockercliutils.ClearTestSession(t, testSessionUID)
4148
}

‎logger/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ test-unit:
3333
@echo no unit tests
3434

3535
test-functional:
36-
GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -timeout 7m -v ./tests/...
36+
GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./tests/...
3737

3838
.PHONY: test

‎logger/tests/loggerComponent_test.go‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import (
88
"github.com/deis/deis/tests/utils"
99
)
1010

11-
func runDeisLoggerTest(t *testing.T, testSessionUID string, port string) {
11+
func runDeisLoggerTest(
12+
t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
1213
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
1314
done := make(chan bool, 1)
1415
dockercliutils.BuildDockerfile(t, "../", "deis/logger:"+testSessionUID)
@@ -19,23 +20,26 @@ func runDeisLoggerTest(t *testing.T, testSessionUID string, port string) {
1920
go func() {
2021
<-done
2122
dockercliutils.RunContainer(t, cli,
22-
"--name", "deis-logger-"+testSessionUID, "-p", "514:514/udp",
23-
"-e", "PUBLISH=514", "-e", "HOST="+IPAddress,
24-
"-e", "ETCD_PORT="+port, "--volumes-from", "deis-logger-data",
23+
"--name", "deis-logger-"+testSessionUID,
24+
"-p", servicePort+":514/udp",
25+
"-e", "PUBLISH="+servicePort,
26+
"-e", "HOST="+IPAddress,
27+
"-e", "ETCD_PORT="+etcdPort,
28+
"--volumes-from", "deis-logger-data",
2529
"deis/logger:"+testSessionUID)
2630
}()
2731
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "deis-logger running")
2832
}
2933

3034
func TestBuild(t *testing.T) {
3135
var testSessionUID = utils.NewUuid()
32-
port := utils.GetRandomPort()
36+
etcdPort := utils.GetRandomPort()
37+
servicePort := utils.GetRandomPort()
3338
fmt.Println("UUID for the session logger Test :" + testSessionUID)
34-
//testSessionUID := "352aea64"
35-
dockercliutils.RunEtcdTest(t, testSessionUID, port)
39+
dockercliutils.RunEtcdTest(t, testSessionUID, etcdPort)
3640
fmt.Println("starting logger componenet test:")
37-
runDeisLoggerTest(t, testSessionUID, port)
41+
runDeisLoggerTest(t, testSessionUID, etcdPort, servicePort)
3842
dockercliutils.DeisServiceTest(
39-
t, "deis-logger-"+testSessionUID, "514", "udp")
43+
t, "deis-logger-"+testSessionUID, servicePort, "udp")
4044
dockercliutils.ClearTestSession(t, testSessionUID)
4145
}

0 commit comments

Comments
 (0)