Skip to content

Commit 358d123

Browse files
mboersmamboersma
committed
Merge pull request #1527 from deis/test-integration-no-json
ref(tests): clean up and pare down test code
2 parents 9bad5ef + 9028697 commit 358d123

28 files changed

Lines changed: 540 additions & 1616 deletions

File tree

‎builder/tests/builder_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ import (
55
"testing"
66
"time"
77

8-
"github.com/deis/deis/tests/dockercliutils"
8+
"github.com/deis/deis/tests/dockercli"
99
"github.com/deis/deis/tests/etcdutils"
1010
"github.com/deis/deis/tests/utils"
1111
)
1212

1313
func runDeisBuilderTest(
1414
t *testing.T, testID string, etcdPort string, servicePort string) {
1515
var err error
16-
dockercliutils.RunDeisDataTest(t, "--name", "deis-builder-data",
16+
dockercli.RunDeisDataTest(t, "--name", "deis-builder-data",
1717
"-v", "/var/lib/docker", "deis/base", "true")
18-
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
18+
cli, stdout, stdoutPipe := dockercli.GetNewClient()
1919
go func() {
20-
err = dockercliutils.RunContainer(cli,
20+
err = dockercli.RunContainer(cli,
2121
"--name", "deis-builder-"+testID,
2222
"--rm",
2323
"-p", servicePort+":22",
@@ -29,7 +29,7 @@ func runDeisBuilderTest(
2929
"--volumes-from", "deis-builder-data",
3030
"--privileged", "deis/builder:"+testID)
3131
}()
32-
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "deis-builder running")
32+
dockercli.PrintToStdout(t, stdout, stdoutPipe, "deis-builder running")
3333
if err != nil {
3434
t.Fatal(err)
3535
}
@@ -51,21 +51,21 @@ func TestBuilder(t *testing.T) {
5151
"/deis/domains",
5252
"/deis/services",
5353
}
54-
testID := utils.NewUuid()
55-
err := dockercliutils.BuildImage(t, "../", "deis/builder:"+testID)
54+
testID := utils.NewID()
55+
err := dockercli.BuildImage(t, "../", "deis/builder:"+testID)
5656
if err != nil {
5757
t.Fatal(err)
5858
}
5959
etcdPort := utils.GetRandomPort()
60-
dockercliutils.RunEtcdTest(t, testID, etcdPort)
60+
dockercli.RunEtcdTest(t, testID, etcdPort)
6161
handler := etcdutils.InitetcdValues(setdir, setkeys, etcdPort)
6262
etcdutils.Publishvalues(t, handler)
6363
servicePort := utils.GetRandomPort()
6464
fmt.Printf("--- Test deis-builder-%s at port %s\n", testID, servicePort)
6565
runDeisBuilderTest(t, testID, etcdPort, servicePort)
6666
// TODO: builder needs a few seconds to wake up here--fixme!
6767
time.Sleep(5000 * time.Millisecond)
68-
dockercliutils.DeisServiceTest(
68+
dockercli.DeisServiceTest(
6969
t, "deis-builder-"+testID, servicePort, "tcp")
70-
dockercliutils.ClearTestSession(t, testID)
70+
dockercli.ClearTestSession(t, testID)
7171
}

‎cache/tests/cache_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ import (
44
"fmt"
55
"testing"
66

7-
"github.com/deis/deis/tests/dockercliutils"
7+
"github.com/deis/deis/tests/dockercli"
88
"github.com/deis/deis/tests/utils"
99
)
1010

1111
func runDeisCacheTest(
1212
t *testing.T, testID string, etcdPort string, servicePort string) {
1313
var err error
14-
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
14+
cli, stdout, stdoutPipe := dockercli.GetNewClient()
1515
go func() {
16-
err = dockercliutils.RunContainer(cli,
16+
err = dockercli.RunContainer(cli,
1717
"--name", "deis-cache-"+testID,
1818
"--rm",
1919
"-p", servicePort+":6379",
@@ -22,24 +22,24 @@ func runDeisCacheTest(
2222
"-e", "ETCD_PORT="+etcdPort,
2323
"deis/cache:"+testID)
2424
}()
25-
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "started")
25+
dockercli.PrintToStdout(t, stdout, stdoutPipe, "started")
2626
if err != nil {
2727
t.Fatal(err)
2828
}
2929
}
3030

3131
func TestCache(t *testing.T) {
32-
testID := utils.NewUuid()
33-
err := dockercliutils.BuildImage(t, "../", "deis/cache:"+testID)
32+
testID := utils.NewID()
33+
err := dockercli.BuildImage(t, "../", "deis/cache:"+testID)
3434
if err != nil {
3535
t.Fatal(err)
3636
}
3737
etcdPort := utils.GetRandomPort()
38-
dockercliutils.RunEtcdTest(t, testID, etcdPort)
38+
dockercli.RunEtcdTest(t, testID, etcdPort)
3939
servicePort := utils.GetRandomPort()
4040
fmt.Printf("--- Test deis-cache-%s at port %s\n", testID, servicePort)
4141
runDeisCacheTest(t, testID, etcdPort, servicePort)
42-
dockercliutils.DeisServiceTest(
42+
dockercli.DeisServiceTest(
4343
t, "deis-cache-"+testID, servicePort, "tcp")
44-
dockercliutils.ClearTestSession(t, testID)
44+
dockercli.ClearTestSession(t, testID)
4545
}

‎controller/tests/controller_test.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ import (
44
"fmt"
55
"testing"
66

7-
"github.com/deis/deis/tests/dockercliutils"
7+
"github.com/deis/deis/tests/dockercli"
88
"github.com/deis/deis/tests/etcdutils"
9-
"github.com/deis/deis/tests/mockserviceutils"
9+
"github.com/deis/deis/tests/mock"
1010
"github.com/deis/deis/tests/utils"
1111
)
1212

1313
func runDeisControllerTest(
1414
t *testing.T, testID string, etcdPort string, servicePort string) {
1515
var err error
16-
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
16+
cli, stdout, stdoutPipe := dockercli.GetNewClient()
1717
go func() {
18-
err = dockercliutils.RunContainer(cli,
18+
err = dockercli.RunContainer(cli,
1919
"--name", "deis-controller-"+testID,
2020
"--rm",
2121
"-p", servicePort+":8000",
@@ -24,7 +24,7 @@ func runDeisControllerTest(
2424
"-e", "ETCD_PORT="+etcdPort,
2525
"deis/controller:"+testID)
2626
}()
27-
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "Booting")
27+
dockercli.PrintToStdout(t, stdout, stdoutPipe, "Booting")
2828
if err != nil {
2929
t.Fatal(err)
3030
}
@@ -45,21 +45,21 @@ func TestController(t *testing.T) {
4545
"/deis/registry",
4646
"/deis/domains",
4747
}
48-
testID := utils.NewUuid()
49-
err := dockercliutils.BuildImage(t, "../", "deis/controller:"+testID)
48+
testID := utils.NewID()
49+
err := dockercli.BuildImage(t, "../", "deis/controller:"+testID)
5050
if err != nil {
5151
t.Fatal(err)
5252
}
5353
etcdPort := utils.GetRandomPort()
54-
dockercliutils.RunEtcdTest(t, testID, etcdPort)
54+
dockercli.RunEtcdTest(t, testID, etcdPort)
5555
handler := etcdutils.InitetcdValues(setdir, setkeys, etcdPort)
5656
etcdutils.Publishvalues(t, handler)
5757
dbPort := utils.GetRandomPort()
58-
mockserviceutils.RunMockDatabase(t, testID, etcdPort, dbPort)
58+
mock.RunMockDatabase(t, testID, etcdPort, dbPort)
5959
servicePort := utils.GetRandomPort()
6060
fmt.Printf("--- Test deis-controller-%s at port %s\n", testID, servicePort)
6161
runDeisControllerTest(t, testID, etcdPort, servicePort)
62-
dockercliutils.DeisServiceTest(
62+
dockercli.DeisServiceTest(
6363
t, "deis-controller-"+testID, servicePort, "http")
64-
dockercliutils.ClearTestSession(t, testID)
64+
dockercli.ClearTestSession(t, testID)
6565
}

‎database/tests/database_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ import (
44
"fmt"
55
"testing"
66

7-
"github.com/deis/deis/tests/dockercliutils"
7+
"github.com/deis/deis/tests/dockercli"
88
"github.com/deis/deis/tests/utils"
99
)
1010

1111
func runDeisDatabaseTest(
1212
t *testing.T, testID string, etcdPort string, servicePort string) {
1313
var err error
14-
dockercliutils.RunDeisDataTest(t, "--name", "deis-database-data",
14+
dockercli.RunDeisDataTest(t, "--name", "deis-database-data",
1515
"-v", "/var/lib/postgresql", "deis/base", "true")
16-
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
16+
cli, stdout, stdoutPipe := dockercli.GetNewClient()
1717
go func() {
18-
err = dockercliutils.RunContainer(cli,
18+
err = dockercli.RunContainer(cli,
1919
"--name", "deis-database-"+testID,
2020
"--rm",
2121
"-p", servicePort+":5432",
@@ -25,24 +25,24 @@ func runDeisDatabaseTest(
2525
"--volumes-from", "deis-database-data",
2626
"deis/database:"+testID)
2727
}()
28-
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "deis-database running")
28+
dockercli.PrintToStdout(t, stdout, stdoutPipe, "deis-database running")
2929
if err != nil {
3030
t.Fatal(err)
3131
}
3232
}
3333

3434
func TestDatabase(t *testing.T) {
35-
testID := utils.NewUuid()
36-
err := dockercliutils.BuildImage(t, "../", "deis/database:"+testID)
35+
testID := utils.NewID()
36+
err := dockercli.BuildImage(t, "../", "deis/database:"+testID)
3737
if err != nil {
3838
t.Fatal(err)
3939
}
4040
etcdPort := utils.GetRandomPort()
41-
dockercliutils.RunEtcdTest(t, testID, etcdPort)
41+
dockercli.RunEtcdTest(t, testID, etcdPort)
4242
servicePort := utils.GetRandomPort()
4343
fmt.Printf("--- Test deis-database-%s at port %s\n", testID, servicePort)
4444
runDeisDatabaseTest(t, testID, etcdPort, servicePort)
45-
dockercliutils.DeisServiceTest(
45+
dockercli.DeisServiceTest(
4646
t, "deis-database-"+testID, servicePort, "tcp")
47-
dockercliutils.ClearTestSession(t, testID)
47+
dockercli.ClearTestSession(t, testID)
4848
}

‎logger/tests/logger_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ import (
44
"fmt"
55
"testing"
66

7-
"github.com/deis/deis/tests/dockercliutils"
7+
"github.com/deis/deis/tests/dockercli"
88
"github.com/deis/deis/tests/utils"
99
)
1010

1111
func runDeisLoggerTest(
1212
t *testing.T, testID string, etcdPort string, servicePort string) {
1313
var err error
14-
dockercliutils.RunDeisDataTest(t, "--name", "deis-logger-data",
14+
dockercli.RunDeisDataTest(t, "--name", "deis-logger-data",
1515
"-v", "/var/log/deis", "deis/base", "/bin/true")
16-
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
16+
cli, stdout, stdoutPipe := dockercli.GetNewClient()
1717
go func() {
18-
err = dockercliutils.RunContainer(cli,
18+
err = dockercli.RunContainer(cli,
1919
"--name", "deis-logger-"+testID,
2020
"--rm",
2121
"-p", servicePort+":514/udp",
@@ -25,24 +25,24 @@ func runDeisLoggerTest(
2525
"--volumes-from", "deis-logger-data",
2626
"deis/logger:"+testID)
2727
}()
28-
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "deis-logger running")
28+
dockercli.PrintToStdout(t, stdout, stdoutPipe, "deis-logger running")
2929
if err != nil {
3030
t.Fatal(err)
3131
}
3232
}
3333

3434
func TestLogger(t *testing.T) {
35-
testID := utils.NewUuid()
36-
err := dockercliutils.BuildImage(t, "../", "deis/logger:"+testID)
35+
testID := utils.NewID()
36+
err := dockercli.BuildImage(t, "../", "deis/logger:"+testID)
3737
if err != nil {
3838
t.Fatal(err)
3939
}
4040
etcdPort := utils.GetRandomPort()
41-
dockercliutils.RunEtcdTest(t, testID, etcdPort)
41+
dockercli.RunEtcdTest(t, testID, etcdPort)
4242
servicePort := utils.GetRandomPort()
4343
fmt.Printf("--- Test deis-logger-%s at port %s\n", testID, servicePort)
4444
runDeisLoggerTest(t, testID, etcdPort, servicePort)
45-
dockercliutils.DeisServiceTest(
45+
dockercli.DeisServiceTest(
4646
t, "deis-logger-"+testID, servicePort, "udp")
47-
dockercliutils.ClearTestSession(t, testID)
47+
dockercli.ClearTestSession(t, testID)
4848
}

‎registry/tests/registry_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ import (
44
"fmt"
55
"testing"
66

7-
"github.com/deis/deis/tests/dockercliutils"
7+
"github.com/deis/deis/tests/dockercli"
88
"github.com/deis/deis/tests/etcdutils"
99
"github.com/deis/deis/tests/utils"
1010
)
1111

1212
func runDeisRegistryTest(
1313
t *testing.T, testID string, etcdPort string, servicePort string) {
1414
var err error
15-
dockercliutils.RunDeisDataTest(t, "--name", "deis-registry-data",
15+
dockercli.RunDeisDataTest(t, "--name", "deis-registry-data",
1616
"-v", "/data", "deis/base", "/bin/true")
17-
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
17+
cli, stdout, stdoutPipe := dockercli.GetNewClient()
1818
go func() {
19-
err = dockercliutils.RunContainer(cli,
19+
err = dockercli.RunContainer(cli,
2020
"--name", "deis-registry-"+testID,
2121
"--rm",
2222
"-p", servicePort+":5000",
@@ -26,7 +26,7 @@ func runDeisRegistryTest(
2626
"--volumes-from", "deis-registry-data",
2727
"deis/registry:"+testID)
2828
}()
29-
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "Booting")
29+
dockercli.PrintToStdout(t, stdout, stdoutPipe, "Booting")
3030
if err != nil {
3131
t.Fatal(err)
3232
}
@@ -40,19 +40,19 @@ func TestRegistry(t *testing.T) {
4040
setdir := []string{
4141
"/deis/cache",
4242
}
43-
testID := utils.NewUuid()
44-
err := dockercliutils.BuildImage(t, "../", "deis/registry:"+testID)
43+
testID := utils.NewID()
44+
err := dockercli.BuildImage(t, "../", "deis/registry:"+testID)
4545
if err != nil {
4646
t.Fatal(err)
4747
}
4848
etcdPort := utils.GetRandomPort()
49-
dockercliutils.RunEtcdTest(t, testID, etcdPort)
49+
dockercli.RunEtcdTest(t, testID, etcdPort)
5050
handler := etcdutils.InitetcdValues(setdir, setkeys, etcdPort)
5151
etcdutils.Publishvalues(t, handler)
5252
servicePort := utils.GetRandomPort()
5353
fmt.Printf("--- Test deis-registry-%s at port %s\n", testID, servicePort)
5454
runDeisRegistryTest(t, testID, etcdPort, servicePort)
55-
dockercliutils.DeisServiceTest(
55+
dockercli.DeisServiceTest(
5656
t, "deis-registry-"+testID, servicePort, "http")
57-
dockercliutils.ClearTestSession(t, testID)
57+
dockercli.ClearTestSession(t, testID)
5858
}

‎router/tests/router_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ import (
55
"testing"
66
"time"
77

8-
"github.com/deis/deis/tests/dockercliutils"
8+
"github.com/deis/deis/tests/dockercli"
99
"github.com/deis/deis/tests/etcdutils"
1010
"github.com/deis/deis/tests/utils"
1111
)
1212

1313
func runDeisRouterTest(
1414
t *testing.T, testID string, etcdPort string, servicePort string) {
1515
var err error
16-
cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
16+
cli, stdout, stdoutPipe := dockercli.GetNewClient()
1717
go func() {
18-
err = dockercliutils.RunContainer(cli,
18+
err = dockercli.RunContainer(cli,
1919
"--name", "deis-router-"+testID,
2020
"--rm",
2121
"-p", servicePort+":80",
@@ -25,7 +25,7 @@ func runDeisRouterTest(
2525
"-e", "ETCD_PORT="+etcdPort,
2626
"deis/router:"+testID)
2727
}()
28-
dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "deis-router running")
28+
dockercli.PrintToStdout(t, stdout, stdoutPipe, "deis-router running")
2929
if err != nil {
3030
t.Fatal(err)
3131
}
@@ -46,21 +46,21 @@ func TestRouter(t *testing.T) {
4646
"/deis/builder",
4747
"/deis/domains",
4848
}
49-
testID := utils.NewUuid()
50-
err := dockercliutils.BuildImage(t, "../", "deis/router:"+testID)
49+
testID := utils.NewID()
50+
err := dockercli.BuildImage(t, "../", "deis/router:"+testID)
5151
if err != nil {
5252
t.Fatal(err)
5353
}
5454
etcdPort := utils.GetRandomPort()
55-
dockercliutils.RunEtcdTest(t, testID, etcdPort)
55+
dockercli.RunEtcdTest(t, testID, etcdPort)
5656
handler := etcdutils.InitetcdValues(setdir, setkeys, etcdPort)
5757
etcdutils.Publishvalues(t, handler)
5858
servicePort := utils.GetRandomPort()
5959
fmt.Printf("--- Test deis-router-%s at port %s\n", testID, servicePort)
6060
runDeisRouterTest(t, testID, etcdPort, servicePort)
6161
// TODO: nginx needs a few seconds to wake up here--fixme!
6262
time.Sleep(5000 * time.Millisecond)
63-
dockercliutils.DeisServiceTest(
63+
dockercli.DeisServiceTest(
6464
t, "deis-router-"+testID, servicePort, "http")
65-
dockercliutils.ClearTestSession(t, testID)
65+
dockercli.ClearTestSession(t, testID)
6666
}

0 commit comments

Comments
 (0)