Skip to content

Commit eab8cdf

Browse files
mboersmamboersma
committed
refactor(tests): remove unneeded sleep and sync code
1 parent 54a67df commit eab8cdf

7 files changed

Lines changed: 93 additions & 129 deletions

File tree

‎builder/tests/builder_test.go‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,24 @@ import (
1111
)
1212

1313
func runDeisBuilderTest(
14-
t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
14+
t *testing.T, testID string, etcdPort string, servicePort string) {
1515
var err error
16-
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
17-
done := make(chan bool, 1)
1816
dockercliutils.RunDeisDataTest(t, "--name", "deis-builder-data",
19-
"-v", "/var/lib/docker", "deis/base", "/bin/true")
20-
ipaddr := utils.GetHostIPAddress()
21-
done <- true
17+
"-v", "/var/lib/docker", "deis/base", "true")
18+
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
2219
go func() {
23-
<-done
2420
err = dockercliutils.RunContainer(cli,
25-
"--name", "deis-builder-"+testSessionUID,
21+
"--name", "deis-builder-"+testID,
2622
"--rm",
2723
"-p", servicePort+":22",
2824
"-e", "PUBLISH=22",
2925
"-e", "STORAGE_DRIVER=devicemapper",
30-
"-e", "HOST="+ipaddr,
26+
"-e", "HOST="+utils.GetHostIPAddress(),
3127
"-e", "ETCD_PORT="+etcdPort,
3228
"-e", "PORT="+servicePort,
3329
"--volumes-from", "deis-builder-data",
34-
"--privileged", "deis/builder:"+testSessionUID)
30+
"--privileged", "deis/builder:"+testID)
3531
}()
36-
time.Sleep(5000 * time.Millisecond)
3732
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "deis-builder running")
3833
if err != nil {
3934
t.Fatal(err)
@@ -55,21 +50,21 @@ func TestBuilder(t *testing.T) {
5550
"/deis/registry",
5651
"/deis/domains",
5752
}
58-
testSessionUID := utils.NewUuid()
59-
err := dockercliutils.BuildImage(t, "../", "deis/builder:"+testSessionUID)
53+
testID := utils.NewUuid()
54+
err := dockercliutils.BuildImage(t, "../", "deis/builder:"+testID)
6055
if err != nil {
6156
t.Fatal(err)
6257
}
6358
etcdPort := utils.GetRandomPort()
64-
dockercliutils.RunEtcdTest(t, testSessionUID, etcdPort)
65-
Builderhandler := etcdutils.InitetcdValues(setdir, setkeys, etcdPort)
66-
etcdutils.Publishvalues(t, Builderhandler)
67-
fmt.Println("starting Builder Component test")
59+
dockercliutils.RunEtcdTest(t, testID, etcdPort)
60+
handler := etcdutils.InitetcdValues(setdir, setkeys, etcdPort)
61+
etcdutils.Publishvalues(t, handler)
6862
servicePort := utils.GetRandomPort()
69-
runDeisBuilderTest(t, testSessionUID, etcdPort, servicePort)
63+
fmt.Printf("--- Test deis-builder-%s at port %s\n", testID, servicePort)
64+
runDeisBuilderTest(t, testID, etcdPort, servicePort)
7065
// TODO: builder needs a few seconds to wake up here--fixme!
7166
time.Sleep(5000 * time.Millisecond)
7267
dockercliutils.DeisServiceTest(
73-
t, "deis-builder-"+testSessionUID, servicePort, "tcp")
74-
dockercliutils.ClearTestSession(t, testSessionUID)
68+
t, "deis-builder-"+testID, servicePort, "tcp")
69+
dockercliutils.ClearTestSession(t, testID)
7570
}

‎cache/tests/cache_test.go‎

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

11-
func runDeisCacheTest(t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
11+
func runDeisCacheTest(
12+
t *testing.T, testID string, etcdPort string, servicePort string) {
1213
var err error
1314
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
14-
done := make(chan bool, 1)
15-
ipaddr := utils.GetHostIPAddress()
16-
done <- true
1715
go func() {
18-
<-done
1916
err = dockercliutils.RunContainer(cli,
20-
"--name", "deis-cache-"+testSessionUID,
17+
"--name", "deis-cache-"+testID,
2118
"--rm",
2219
"-p", servicePort+":6379",
2320
"-e", "PUBLISH="+servicePort,
24-
"-e", "HOST="+ipaddr,
21+
"-e", "HOST="+utils.GetHostIPAddress(),
2522
"-e", "ETCD_PORT="+etcdPort,
26-
"deis/cache:"+testSessionUID)
23+
"deis/cache:"+testID)
2724
}()
2825
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "started")
2926
if err != nil {
@@ -32,17 +29,17 @@ func runDeisCacheTest(t *testing.T, testSessionUID string, etcdPort string, serv
3229
}
3330

3431
func TestCache(t *testing.T) {
35-
testSessionUID := utils.NewUuid()
36-
err := dockercliutils.BuildImage(t, "../", "deis/cache:"+testSessionUID)
32+
testID := utils.NewUuid()
33+
err := dockercliutils.BuildImage(t, "../", "deis/cache:"+testID)
3734
if err != nil {
3835
t.Fatal(err)
3936
}
4037
etcdPort := utils.GetRandomPort()
41-
dockercliutils.RunEtcdTest(t, testSessionUID, etcdPort)
42-
fmt.Println("starting cache component test:")
38+
dockercliutils.RunEtcdTest(t, testID, etcdPort)
4339
servicePort := utils.GetRandomPort()
44-
runDeisCacheTest(t, testSessionUID, etcdPort, servicePort)
40+
fmt.Printf("--- Test deis-cache-%s at port %s\n", testID, servicePort)
41+
runDeisCacheTest(t, testID, etcdPort, servicePort)
4542
dockercliutils.DeisServiceTest(
46-
t, "deis-cache-"+testSessionUID, servicePort, "tcp")
47-
dockercliutils.ClearTestSession(t, testSessionUID)
43+
t, "deis-cache-"+testID, servicePort, "tcp")
44+
dockercliutils.ClearTestSession(t, testID)
4845
}

‎controller/tests/controller_test.go‎

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,27 @@ package tests
33
import (
44
"fmt"
55
"testing"
6-
"time"
76

87
"github.com/deis/deis/tests/dockercliutils"
98
"github.com/deis/deis/tests/etcdutils"
109
"github.com/deis/deis/tests/mockserviceutils"
1110
"github.com/deis/deis/tests/utils"
1211
)
1312

14-
func runDeisControllerTest(t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
13+
func runDeisControllerTest(
14+
t *testing.T, testID string, etcdPort string, servicePort string) {
1515
var err error
1616
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
17-
done := make(chan bool, 1)
18-
ipaddr := utils.GetHostIPAddress()
19-
done <- true
2017
go func() {
21-
<-done
2218
err = dockercliutils.RunContainer(cli,
23-
"--name", "deis-controller-"+testSessionUID,
19+
"--name", "deis-controller-"+testID,
2420
"--rm",
2521
"-p", servicePort+":8000",
2622
"-e", "PUBLISH="+servicePort,
27-
"-e", "HOST="+ipaddr,
23+
"-e", "HOST="+utils.GetHostIPAddress(),
2824
"-e", "ETCD_PORT="+etcdPort,
29-
"deis/controller:"+testSessionUID)
25+
"deis/controller:"+testID)
3026
}()
31-
time.Sleep(5000 * time.Millisecond)
3227
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "Booting")
3328
if err != nil {
3429
t.Fatal(err)
@@ -50,22 +45,21 @@ func TestController(t *testing.T) {
5045
"/deis/registry",
5146
"/deis/domains",
5247
}
53-
testSessionUID := utils.NewUuid()
54-
err := dockercliutils.BuildImage(t, "../", "deis/controller:"+testSessionUID)
48+
testID := utils.NewUuid()
49+
err := dockercliutils.BuildImage(t, "../", "deis/controller:"+testID)
5550
if err != nil {
5651
t.Fatal(err)
5752
}
5853
etcdPort := utils.GetRandomPort()
59-
servicePort := utils.GetRandomPort()
54+
dockercliutils.RunEtcdTest(t, testID, etcdPort)
55+
handler := etcdutils.InitetcdValues(setdir, setkeys, etcdPort)
56+
etcdutils.Publishvalues(t, handler)
6057
dbPort := utils.GetRandomPort()
61-
dockercliutils.RunEtcdTest(t, testSessionUID, etcdPort)
62-
fmt.Println("starting controller test:")
63-
Controllerhandler := etcdutils.InitetcdValues(setdir, setkeys, etcdPort)
64-
etcdutils.Publishvalues(t, Controllerhandler)
65-
mockserviceutils.RunMockDatabase(t, testSessionUID, etcdPort, dbPort)
66-
fmt.Println("starting Controller component test")
67-
runDeisControllerTest(t, testSessionUID, etcdPort, servicePort)
58+
mockserviceutils.RunMockDatabase(t, testID, etcdPort, dbPort)
59+
servicePort := utils.GetRandomPort()
60+
fmt.Printf("--- Test deis-controller-%s at port %s\n", testID, servicePort)
61+
runDeisControllerTest(t, testID, etcdPort, servicePort)
6862
dockercliutils.DeisServiceTest(
69-
t, "deis-controller-"+testSessionUID, servicePort, "http")
70-
dockercliutils.ClearTestSession(t, testSessionUID)
63+
t, "deis-controller-"+testID, servicePort, "http")
64+
dockercliutils.ClearTestSession(t, testID)
7165
}

‎database/tests/database_test.go‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,21 @@ import (
99
)
1010

1111
func runDeisDatabaseTest(
12-
t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
12+
t *testing.T, testID string, etcdPort string, servicePort string) {
1313
var err error
14-
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
15-
done := make(chan bool, 1)
1614
dockercliutils.RunDeisDataTest(t, "--name", "deis-database-data",
1715
"-v", "/var/lib/postgresql", "deis/base", "true")
18-
ipaddr := utils.GetHostIPAddress()
19-
done <- true
16+
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
2017
go func() {
21-
<-done
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
2518
err = dockercliutils.RunContainer(cli,
26-
"--name", "deis-database-"+testSessionUID,
19+
"--name", "deis-database-"+testID,
2720
"--rm",
2821
"-p", servicePort+":5432",
2922
"-e", "PUBLISH="+servicePort,
30-
"-e", "HOST="+ipaddr,
23+
"-e", "HOST="+utils.GetHostIPAddress(),
3124
"-e", "ETCD_PORT="+etcdPort,
3225
"--volumes-from", "deis-database-data",
33-
"deis/database:"+testSessionUID)
26+
"deis/database:"+testID)
3427
}()
3528
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "deis-database running")
3629
if err != nil {
@@ -39,17 +32,17 @@ func runDeisDatabaseTest(
3932
}
4033

4134
func TestDatabase(t *testing.T) {
42-
testSessionUID := utils.NewUuid()
43-
err := dockercliutils.BuildImage(t, "../", "deis/database:"+testSessionUID)
35+
testID := utils.NewUuid()
36+
err := dockercliutils.BuildImage(t, "../", "deis/database:"+testID)
4437
if err != nil {
4538
t.Fatal(err)
4639
}
4740
etcdPort := utils.GetRandomPort()
48-
dockercliutils.RunEtcdTest(t, testSessionUID, etcdPort)
49-
fmt.Println("starting Database component test:")
41+
dockercliutils.RunEtcdTest(t, testID, etcdPort)
5042
servicePort := utils.GetRandomPort()
51-
runDeisDatabaseTest(t, testSessionUID, etcdPort, servicePort)
43+
fmt.Printf("--- Test deis-database-%s at port %s\n", testID, servicePort)
44+
runDeisDatabaseTest(t, testID, etcdPort, servicePort)
5245
dockercliutils.DeisServiceTest(
53-
t, "deis-database-"+testSessionUID, servicePort, "tcp")
54-
dockercliutils.ClearTestSession(t, testSessionUID)
46+
t, "deis-database-"+testID, servicePort, "tcp")
47+
dockercliutils.ClearTestSession(t, testID)
5548
}

‎logger/tests/logger_test.go‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,21 @@ import (
99
)
1010

1111
func runDeisLoggerTest(
12-
t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
12+
t *testing.T, testID string, etcdPort string, servicePort string) {
1313
var err error
14-
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
15-
done := make(chan bool, 1)
1614
dockercliutils.RunDeisDataTest(t, "--name", "deis-logger-data",
17-
"-v", "/var/log/deis", "deis/base", "true")
18-
ipaddr := utils.GetHostIPAddress()
19-
done <- true
15+
"-v", "/var/log/deis", "deis/base", "/bin/true")
16+
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
2017
go func() {
21-
<-done
2218
err = dockercliutils.RunContainer(cli,
23-
"--name", "deis-logger-"+testSessionUID,
19+
"--name", "deis-logger-"+testID,
2420
"--rm",
2521
"-p", servicePort+":514/udp",
2622
"-e", "PUBLISH="+servicePort,
27-
"-e", "HOST="+ipaddr,
23+
"-e", "HOST="+utils.GetHostIPAddress(),
2824
"-e", "ETCD_PORT="+etcdPort,
2925
"--volumes-from", "deis-logger-data",
30-
"deis/logger:"+testSessionUID)
26+
"deis/logger:"+testID)
3127
}()
3228
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "deis-logger running")
3329
if err != nil {
@@ -36,17 +32,17 @@ func runDeisLoggerTest(
3632
}
3733

3834
func TestLogger(t *testing.T) {
39-
testSessionUID := utils.NewUuid()
40-
err := dockercliutils.BuildImage(t, "../", "deis/logger:"+testSessionUID)
35+
testID := utils.NewUuid()
36+
err := dockercliutils.BuildImage(t, "../", "deis/logger:"+testID)
4137
if err != nil {
4238
t.Fatal(err)
4339
}
4440
etcdPort := utils.GetRandomPort()
45-
dockercliutils.RunEtcdTest(t, testSessionUID, etcdPort)
46-
fmt.Println("starting logger component test:")
41+
dockercliutils.RunEtcdTest(t, testID, etcdPort)
4742
servicePort := utils.GetRandomPort()
48-
runDeisLoggerTest(t, testSessionUID, etcdPort, servicePort)
43+
fmt.Printf("--- Test deis-logger-%s at port %s\n", testID, servicePort)
44+
runDeisLoggerTest(t, testID, etcdPort, servicePort)
4945
dockercliutils.DeisServiceTest(
50-
t, "deis-logger-"+testSessionUID, servicePort, "udp")
51-
dockercliutils.ClearTestSession(t, testSessionUID)
46+
t, "deis-logger-"+testID, servicePort, "udp")
47+
dockercliutils.ClearTestSession(t, testID)
5248
}

‎registry/tests/registry_test.go‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,52 +3,46 @@ package tests
33
import (
44
"fmt"
55
"testing"
6-
"time"
76

87
"github.com/deis/deis/tests/dockercliutils"
98
"github.com/deis/deis/tests/utils"
109
)
1110

1211
func runDeisRegistryTest(
13-
t *testing.T, testSessionUID string, etcdPort string, servicePort string) {
12+
t *testing.T, testID string, etcdPort string, servicePort string) {
1413
var err error
15-
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
16-
done := make(chan bool, 1)
1714
dockercliutils.RunDeisDataTest(t, "--name", "deis-registry-data",
1815
"-v", "/data", "deis/base", "/bin/true")
19-
ipaddr := utils.GetHostIPAddress()
20-
done <- true
16+
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
2117
go func() {
22-
<-done
2318
err = dockercliutils.RunContainer(cli,
24-
"--name", "deis-registry-"+testSessionUID,
19+
"--name", "deis-registry-"+testID,
2520
"--rm",
2621
"-p", servicePort+":5000",
2722
"-e", "PUBLISH="+servicePort,
28-
"-e", "HOST="+ipaddr,
23+
"-e", "HOST="+utils.GetHostIPAddress(),
2924
"-e", "ETCD_PORT="+etcdPort,
3025
"--volumes-from", "deis-registry-data",
31-
"deis/registry:"+testSessionUID)
26+
"deis/registry:"+testID)
3227
}()
33-
time.Sleep(2000 * time.Millisecond)
3428
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "Booting")
3529
if err != nil {
3630
t.Fatal(err)
3731
}
3832
}
3933

4034
func TestRegistry(t *testing.T) {
41-
testSessionUID := utils.NewUuid()
42-
err := dockercliutils.BuildImage(t, "../", "deis/registry:"+testSessionUID)
35+
testID := utils.NewUuid()
36+
err := dockercliutils.BuildImage(t, "../", "deis/registry:"+testID)
4337
if err != nil {
4438
t.Fatal(err)
4539
}
4640
etcdPort := utils.GetRandomPort()
47-
dockercliutils.RunEtcdTest(t, testSessionUID, etcdPort)
48-
fmt.Println("starting registry component test")
41+
dockercliutils.RunEtcdTest(t, testID, etcdPort)
4942
servicePort := utils.GetRandomPort()
50-
runDeisRegistryTest(t, testSessionUID, etcdPort, servicePort)
43+
fmt.Printf("--- Test deis-registry-%s at port %s\n", testID, servicePort)
44+
runDeisRegistryTest(t, testID, etcdPort, servicePort)
5145
dockercliutils.DeisServiceTest(
52-
t, "deis-registry-"+testSessionUID, servicePort, "http")
53-
dockercliutils.ClearTestSession(t, testSessionUID)
46+
t, "deis-registry-"+testID, servicePort, "http")
47+
dockercliutils.ClearTestSession(t, testID)
5448
}

0 commit comments

Comments
 (0)