Skip to content

Commit 38a2196

Browse files
mboersmamboersma
committed
Merge pull request #1268 from deis/component-tests-fixes
fix(tests): improve reliability and error reporting for component tests
2 parents 8ef3d5b + 18c17bb commit 38a2196

49 files changed

Lines changed: 678 additions & 1298 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,39 @@ func runDeisBuilderTest(
1414
t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
1515
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
1616
done := make(chan bool, 1)
17-
dockercliutils.BuildDockerfile(t, "../", "deis/builder:"+testSessionUID)
17+
err := dockercliutils.BuildImage(t, "../", "deis/builder:"+testSessionUID)
18+
if err != nil {
19+
t.Fatal(err)
20+
}
1821
dockercliutils.RunDeisDataTest(t, "--name", "deis-builder-data",
1922
"-v", "/var/lib/docker", "deis/base", "/bin/true")
2023
//docker run --name deis-builder -p 2223:22 -e PUBLISH=22
2124
// -e HOST=${COREOS_PRIVATE_IPV4} -e PORT=2223
2225
// --volumes-from deis-builder-data --privileged deis/builder
23-
IPAddress := utils.GetHostIPAddress()
26+
ipaddr := utils.GetHostIPAddress()
2427
done <- true
2528
go func() {
2629
<-done
27-
dockercliutils.RunContainer(t, cli, "--name",
28-
"deis-builder-"+testSessionUID,
30+
err = dockercliutils.RunContainer(cli,
31+
"--name", "deis-builder-"+testSessionUID,
32+
"--rm",
2933
"-p", servicePort+":22",
3034
"-e", "PUBLISH=22",
3135
"-e", "STORAGE_DRIVER=devicemapper",
32-
"-e", "HOST="+IPAddress,
36+
"-e", "HOST="+ipaddr,
3337
"-e", "ETCD_PORT="+etcdPort,
3438
"-e", "PORT="+servicePort,
3539
"--volumes-from", "deis-builder-data",
3640
"--privileged", "deis/builder:"+testSessionUID)
3741
}()
3842
time.Sleep(5000 * time.Millisecond)
3943
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "deis-builder running")
44+
if err != nil {
45+
t.Fatal(err)
46+
}
4047
}
4148

42-
func TestBuild(t *testing.T) {
49+
func TestBuilder(t *testing.T) {
4350
setkeys := []string{"/deis/registry/protocol",
4451
"deis/registry/host",
4552
"/deis/registry/port",

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,30 @@ import (
1111
func runDeisCacheTest(t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
1212
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
1313
done := make(chan bool, 1)
14-
dockercliutils.BuildDockerfile(t, "../", "deis/cache:"+testSessionUID)
15-
IPAddress := utils.GetHostIPAddress()
14+
err := dockercliutils.BuildImage(t, "../", "deis/cache:"+testSessionUID)
15+
if err != nil {
16+
t.Fatal(err)
17+
}
18+
ipaddr := utils.GetHostIPAddress()
1619
done <- true
1720
go func() {
1821
<-done
19-
//docker run --name deis-cache -p 6379:6379 -e PUBLISH=6379
20-
// -e HOST=${COREOS_PRIVATE_IPV4} deis/cache
21-
dockercliutils.RunContainer(t, cli, "--name",
22-
"deis-cache-"+testSessionUID,
22+
err = dockercliutils.RunContainer(cli,
23+
"--name", "deis-cache-"+testSessionUID,
24+
"--rm",
2325
"-p", servicePort+":6379",
2426
"-e", "PUBLISH="+servicePort,
25-
"-e", "HOST="+IPAddress,
27+
"-e", "HOST="+ipaddr,
2628
"-e", "ETCD_PORT="+etcdPort,
2729
"deis/cache:"+testSessionUID)
2830
}()
2931
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "started")
32+
if err != nil {
33+
t.Fatal(err)
34+
}
3035
}
3136

32-
func TestBuild(t *testing.T) {
37+
func TestCache(t *testing.T) {
3338
var testSessionUID = utils.NewUuid()
3439
fmt.Println("UUID for the session Cache Test :" + testSessionUID)
3540
etcdPort := utils.GetRandomPort()

controller/tests/controllerComponent_test.go renamed to controller/tests/controller_test.go

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,31 @@ import (
1414
func runDeisControllerTest(t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
1515
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
1616
done := make(chan bool, 1)
17-
dockercliutils.BuildDockerfile(t, "../", "deis/controller:"+testSessionUID)
18-
//docker run --name deis-controller -p 8000:8000 -e PUBLISH=8000
19-
// -e HOST=${COREOS_PRIVATE_IPV4} --volumes-from=deis-logger deis/controller
20-
IPAddress := utils.GetHostIPAddress()
17+
err := dockercliutils.BuildImage(t, "../", "deis/controller:"+testSessionUID)
18+
if err != nil {
19+
t.Fatal(err)
20+
}
21+
ipaddr := utils.GetHostIPAddress()
2122
done <- true
2223
go func() {
2324
<-done
24-
dockercliutils.RunContainer(t, cli, "--name",
25-
"deis-controller-"+testSessionUID,
25+
err = dockercliutils.RunContainer(cli,
26+
"--name", "deis-controller-"+testSessionUID,
27+
"--rm",
2628
"-p", servicePort+":8000",
2729
"-e", "PUBLISH="+servicePort,
28-
"-e", "HOST="+IPAddress,
30+
"-e", "HOST="+ipaddr,
2931
"-e", "ETCD_PORT="+etcdPort,
3032
"deis/controller:"+testSessionUID)
3133
}()
3234
time.Sleep(5000 * time.Millisecond)
3335
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "Booting")
34-
36+
if err != nil {
37+
t.Fatal(err)
38+
}
3539
}
3640

37-
func TestBuild(t *testing.T) {
41+
func TestController(t *testing.T) {
3842
setkeys := []string{"/deis/registry/protocol",
3943
"deis/registry/host",
4044
"/deis/registry/port",

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,36 @@ func runDeisDatabaseTest(
1212
t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
1313
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
1414
done := make(chan bool, 1)
15-
dockercliutils.BuildDockerfile(t, "../", "deis/database:"+testSessionUID)
15+
err := dockercliutils.BuildImage(t, "../", "deis/database:"+testSessionUID)
16+
if err != nil {
17+
t.Fatal(err)
18+
}
1619
dockercliutils.RunDeisDataTest(t, "--name", "deis-database-data",
1720
"-v", "/var/lib/postgresql", "deis/base", "true")
18-
IPAddress := utils.GetHostIPAddress()
21+
ipaddr := utils.GetHostIPAddress()
1922
done <- true
2023
go func() {
2124
<-done
2225
//docker run --name deis-database -p 5432:5432 -e PUBLISH=5432
2326
// -e HOST=${COREOS_PRIVATE_IPV4}
2427
// --volumes-from deis-database-data deis/database
25-
dockercliutils.RunContainer(t, cli, "--name",
26-
"deis-database-"+testSessionUID,
28+
err = dockercliutils.RunContainer(cli,
29+
"--name", "deis-database-"+testSessionUID,
30+
"--rm",
2731
"-p", servicePort+":5432",
2832
"-e", "PUBLISH="+servicePort,
29-
"-e", "HOST="+IPAddress,
33+
"-e", "HOST="+ipaddr,
3034
"-e", "ETCD_PORT="+etcdPort,
3135
"--volumes-from", "deis-database-data",
3236
"deis/database:"+testSessionUID)
3337
}()
3438
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "deis-database running")
39+
if err != nil {
40+
t.Fatal(err)
41+
}
3542
}
3643

37-
func TestBuild(t *testing.T) {
44+
func TestDatabase(t *testing.T) {
3845
var testSessionUID = utils.NewUuid()
3946
fmt.Println("UUID for the session Cache Test :" + testSessionUID)
4047
etcdPort := utils.GetRandomPort()

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,33 @@ func runDeisLoggerTest(
1212
t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
1313
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
1414
done := make(chan bool, 1)
15-
dockercliutils.BuildDockerfile(t, "../", "deis/logger:"+testSessionUID)
15+
err := dockercliutils.BuildImage(t, "../", "deis/logger:"+testSessionUID)
16+
if err != nil {
17+
t.Fatal(err)
18+
}
1619
dockercliutils.RunDeisDataTest(t, "--name", "deis-logger-data",
1720
"-v", "/var/log/deis", "deis/base", "true")
18-
IPAddress := utils.GetHostIPAddress()
21+
ipaddr := utils.GetHostIPAddress()
1922
done <- true
2023
go func() {
2124
<-done
22-
dockercliutils.RunContainer(t, cli,
25+
err = dockercliutils.RunContainer(cli,
2326
"--name", "deis-logger-"+testSessionUID,
27+
"--rm",
2428
"-p", servicePort+":514/udp",
2529
"-e", "PUBLISH="+servicePort,
26-
"-e", "HOST="+IPAddress,
30+
"-e", "HOST="+ipaddr,
2731
"-e", "ETCD_PORT="+etcdPort,
2832
"--volumes-from", "deis-logger-data",
2933
"deis/logger:"+testSessionUID)
3034
}()
3135
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "deis-logger running")
36+
if err != nil {
37+
t.Fatal(err)
38+
}
3239
}
3340

34-
func TestBuild(t *testing.T) {
41+
func TestLogger(t *testing.T) {
3542
var testSessionUID = utils.NewUuid()
3643
etcdPort := utils.GetRandomPort()
3744
servicePort := utils.GetRandomPort()

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,34 @@ func runDeisRegistryTest(
1313
t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
1414
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
1515
done := make(chan bool, 1)
16-
dockercliutils.BuildDockerfile(t, "../", "deis/registry:"+testSessionUID)
16+
err := dockercliutils.BuildImage(t, "../", "deis/registry:"+testSessionUID)
17+
if err != nil {
18+
t.Fatal(err)
19+
}
1720
dockercliutils.RunDeisDataTest(t, "--name", "deis-registry-data",
1821
"-v", "/data", "deis/base", "/bin/true")
19-
IPAddress := utils.GetHostIPAddress()
22+
ipaddr := utils.GetHostIPAddress()
2023
done <- true
2124
go func() {
2225
<-done
23-
dockercliutils.RunContainer(t, cli,
26+
err = dockercliutils.RunContainer(cli,
2427
"--name", "deis-registry-"+testSessionUID,
28+
"--rm",
2529
"-p", servicePort+":5000",
2630
"-e", "PUBLISH="+servicePort,
27-
"-e", "HOST="+IPAddress,
31+
"-e", "HOST="+ipaddr,
2832
"-e", "ETCD_PORT="+etcdPort,
2933
"--volumes-from", "deis-registry-data",
3034
"deis/registry:"+testSessionUID)
3135
}()
3236
time.Sleep(2000 * time.Millisecond)
3337
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "Booting")
38+
if err != nil {
39+
t.Fatal(err)
40+
}
3441
}
3542

36-
func TestBuild(t *testing.T) {
43+
func TestRegistry(t *testing.T) {
3744
var testSessionUID = utils.NewUuid()
3845
fmt.Println("UUID for the session registry Test :" + testSessionUID)
3946
etcdPort := utils.GetRandomPort()

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,32 @@ func runDeisRouterTest(
1414
t *testing.T, testSessionID string, etcdPort string, servicePort string) {
1515
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
1616
done := make(chan bool, 1)
17-
dockercliutils.BuildDockerfile(t, "../", "deis/router:"+testSessionID)
18-
19-
//ocker run --name deis-router -p 80:80 -p 2222:2222 -e PUBLISH=80
20-
// -e HOST=${COREOS_PRIVATE_IPV4} deis/router
21-
IPAddress := utils.GetHostIPAddress()
17+
err := dockercliutils.BuildImage(t, "../", "deis/router:"+testSessionID)
18+
if err != nil {
19+
t.Fatal(err)
20+
}
21+
ipaddr := utils.GetHostIPAddress()
2222
done <- true
2323
go func() {
2424
<-done
25-
dockercliutils.RunContainer(t, cli,
25+
err = dockercliutils.RunContainer(cli,
2626
"--name", "deis-router-"+testSessionID,
27+
"--rm",
2728
"-p", servicePort+":80",
2829
"-p", "2222:2222",
2930
"-e", "PUBLISH="+servicePort,
30-
"-e", "HOST="+IPAddress,
31+
"-e", "HOST="+ipaddr,
3132
"-e", "ETCD_PORT="+etcdPort,
3233
"deis/router:"+testSessionID)
3334
}()
3435
time.Sleep(2000 * time.Millisecond)
3536
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "deis-router running")
37+
if err != nil {
38+
t.Fatal(err)
39+
}
3640
}
3741

38-
func TestBuild(t *testing.T) {
42+
func TestRouter(t *testing.T) {
3943
setkeys := []string{"deis/controller/host",
4044
"/deis/controller/port",
4145
"/deis/builder/host",

‎tests/_vendor/src/github.com/dotcloud/docker/VERSION‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.1.1

0 commit comments

Comments
 (0)