Skip to content

Commit f703b6d

Browse files
ulyssessouzaulyssessouza
committed
Add network tests
Signed-off-by: Ulysses Souza <[email protected]>
1 parent 312a7db commit f703b6d

File tree

7 files changed

+165
-18
lines changed

7 files changed

+165
-18
lines changed

‎Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
.DEFAULT_GOAL := help
22

3+
.PHONY: images
4+
images: ## Build the test images
5+
docker build server -t test-server
6+
37
.PHONY: test
4-
test: ## Run tests
8+
test: images ## Run tests
59
GOPRIVATE=github.com/compose-spec/compatibility-test-suite go test ./... -v
610

711
.PHONY: fmt

‎compliance_test.go

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,45 @@
11
package main
22

33
import (
4-
"path/filepath"
54
"testing"
65
"time"
76

87
"gotest.tools/v3/assert"
98
)
109

11-
func TestSimpleUpDown(t *testing.T) {
12-
for _, f := range listFiles(t, "commands") {
13-
t.Run(f, func(t *testing.T) {
14-
c, err := readConfig(t, filepath.Join("commands", f))
15-
assert.NilError(t, err)
16-
for _, configName := range listDirs(t, "tests") {
17-
assert.NilError(t, err)
18-
executeUp(t, c, configName)
19-
time.Sleep(2 * time.Second) // FIXME Get a better way to do that
20-
executeDown(t, c, configName)
21-
}
22-
})
23-
}
10+
const (
11+
defaultPingEntrypoint = "http://localhost:8080/ping"
12+
targetUrl = "target:8080/ping"
13+
defaultTargetUrl = defaultPingEntrypoint + "?address=" + targetUrl
14+
)
15+
16+
func TestSimpleLifecycle(t *testing.T) {
17+
h := TestHelper{T: t, testDir: "simple_lifecycle"}
18+
h.testUpDown(func(t *testing.T) {
19+
time.Sleep(time.Second) // FIXME Test when the up is complete here
20+
})
21+
}
22+
23+
func TestSimpleNetwork(t *testing.T) {
24+
h := TestHelper{T: t, testDir: "simple_network"}
25+
h.testUpDown(func(t *testing.T) {
26+
actual := getHttpBody(t, defaultTargetUrl)
27+
assert.Assert(t, actual == "{\"response\":\"PONG FROM TARGET\"}\n")
28+
})
29+
}
30+
31+
func TestSimpleNetworkFail(t *testing.T) {
32+
h := TestHelper{T: t, testDir: "simple_network"}
33+
h.testUpDown(func(t *testing.T) {
34+
actual := getHttpBody(t, "http://localhost:8080/ping?address=notatarget:8080/ping")
35+
assert.Assert(t, actual == "{\"response\":\"Could not reach address: notatarget:8080/ping\"}\n")
36+
})
37+
}
38+
39+
func TestDifferentNetworks(t *testing.T) {
40+
h := TestHelper{T: t, testDir: "different_networks"}
41+
h.testUpDown(func(t *testing.T) {
42+
actual := getHttpBody(t, defaultTargetUrl)
43+
assert.Assert(t, actual == "{\"response\":\"Could not reach address: target:8080/ping\"}\n")
44+
})
2445
}

‎go.sum

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,62 @@
1+
github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU=
2+
github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
3+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5+
github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
6+
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
7+
github.com/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo=
8+
github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
9+
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
10+
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
11+
github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
12+
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
113
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
214
github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
315
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
16+
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
17+
github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg=
18+
github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
19+
github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
20+
github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
21+
github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
22+
github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
23+
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
24+
github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg=
25+
github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
26+
github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
27+
github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
428
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
529
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
630
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
31+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
32+
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
733
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
34+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
35+
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
36+
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
37+
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
38+
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
39+
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
40+
github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8=
41+
github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
42+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
843
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
44+
golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
945
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
1046
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
47+
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
1148
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
49+
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
50+
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
51+
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
52+
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1253
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
1354
golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
1455
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
1556
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
1657
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
1758
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
59+
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
1860
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
1961
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
2062
gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E=

‎tests/different_networks/compose.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
version: '3.7'
2+
3+
services:
4+
entry:
5+
image: test-server
6+
build: ../../server
7+
networks:
8+
- entrynetwork
9+
ports:
10+
- 8080:8080
11+
target:
12+
image: test-server
13+
build: ../../server
14+
networks:
15+
- targetnetwork
16+
17+
networks:
18+
entrynetwork:
19+
targetnetwork:

‎tests/lifecycle/compose.yaml renamed to ‎tests/simple_lifecycle/compose.yaml

File renamed without changes.

‎tests/simple_network/compose.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: '3.7'
2+
3+
services:
4+
entry:
5+
image: test-server
6+
build: ../../server
7+
networks:
8+
- mynetwork
9+
ports:
10+
- 8080:8080
11+
target:
12+
image: test-server
13+
build: ../../server
14+
networks:
15+
- mynetwork
16+
17+
networks:
18+
mynetwork:

‎tests_helper.go

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
package main
22

33
import (
4-
"fmt"
4+
"context"
55
"io/ioutil"
6+
"net/http"
67
"os"
78
"path/filepath"
89
"strings"
910
"testing"
1011

12+
"github.com/docker/docker/api/types"
13+
"github.com/docker/docker/client"
1114
"gopkg.in/yaml.v2"
1215
"gotest.tools/v3/assert"
1316
"gotest.tools/v3/icmd"
1417
)
1518

19+
const (
20+
commandsDir = "commands"
21+
)
22+
1623
type Config struct {
1724
Name string `yaml:"name"`
1825
Command string `yaml:"command"`
@@ -61,13 +68,11 @@ func verbWithOptions(c *Config, v Verb) []string {
6168
func executeUp(t *testing.T, c *Config, configName string) {
6269
upOpts := verbWithOptions(c, c.Up)
6370
execCmd(t, c.Command, configName, upOpts)
64-
fmt.Println("Success on up!")
6571
}
6672

6773
func executeDown(t *testing.T, c *Config, configName string) {
6874
downOpts := verbWithOptions(c, c.Down)
6975
execCmd(t, c.Command, configName, downOpts)
70-
fmt.Println("Success on down!")
7176
}
7277

7378
func execCmd(t *testing.T, command string, configName string, opts []string) {
@@ -103,3 +108,41 @@ func listFiles(t *testing.T, dir string) []string {
103108
}
104109
return configFiles
105110
}
111+
112+
func checkDown(t *testing.T) {
113+
cli, err := client.NewEnvClient()
114+
assert.NilError(t, err)
115+
containers, err := cli.ContainerList(context.Background(), types.ContainerListOptions{
116+
All: true,
117+
})
118+
assert.NilError(t, err)
119+
assert.Assert(t, len(containers) == 0)
120+
}
121+
122+
func getHttpBody(t *testing.T, address string) string {
123+
resp, err := http.Get(address)
124+
assert.NilError(t, err)
125+
defer resp.Body.Close()
126+
body, err := ioutil.ReadAll(resp.Body)
127+
assert.NilError(t, err)
128+
return string(body)
129+
}
130+
131+
type TestHelper struct {
132+
*testing.T
133+
testDir string
134+
}
135+
136+
func (h TestHelper) testUpDown(fun func(t *testing.T)) {
137+
assert.Assert(h, fun != nil, "Test function cannot be `nil`")
138+
for _, f := range listFiles(h.T, commandsDir) {
139+
h.Run(f, func(t *testing.T) {
140+
c, err := readConfig(t, filepath.Join(commandsDir, f))
141+
assert.NilError(t, err)
142+
executeUp(t, c, h.testDir)
143+
fun(t)
144+
executeDown(t, c, h.testDir)
145+
checkDown(t)
146+
})
147+
}
148+
}

0 commit comments

Comments
 (0)