Browse code
Avoid unique name usage in TestDockerNetworkConnectAlias
In TestDockerNetworkConnectAlias the network and container
names used are unique which are not preferred. This
fix address the issue by appending t.Name() so that
names are randomized.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Yong Tang authored on 2018/05/12 05:04:34Showing 1 changed files
| ... | ... |
@@ -20,14 +20,14 @@ func TestDockerNetworkConnectAlias(t *testing.T) {
|
| 20 | 20 |
defer client.Close() |
| 21 | 21 |
ctx := context.Background() |
| 22 | 22 |
|
| 23 |
- name := "test-alias" |
|
| 23 |
+ name := t.Name() + "test-alias" |
|
| 24 | 24 |
_, err := client.NetworkCreate(ctx, name, types.NetworkCreate{
|
| 25 | 25 |
Driver: "overlay", |
| 26 | 26 |
Attachable: true, |
| 27 | 27 |
}) |
| 28 | 28 |
assert.NilError(t, err) |
| 29 | 29 |
|
| 30 |
- container.Create(t, ctx, client, container.WithName("ng1"), func(c *container.TestContainerConfig) {
|
|
| 30 |
+ cID1 := container.Create(t, ctx, client, func(c *container.TestContainerConfig) {
|
|
| 31 | 31 |
c.NetworkingConfig = &network.NetworkingConfig{
|
| 32 | 32 |
map[string]*network.EndpointSettings{
|
| 33 | 33 |
name: {},
|
| ... | ... |
@@ -35,22 +35,22 @@ func TestDockerNetworkConnectAlias(t *testing.T) {
|
| 35 | 35 |
} |
| 36 | 36 |
}) |
| 37 | 37 |
|
| 38 |
- err = client.NetworkConnect(ctx, name, "ng1", &network.EndpointSettings{
|
|
| 38 |
+ err = client.NetworkConnect(ctx, name, cID1, &network.EndpointSettings{
|
|
| 39 | 39 |
Aliases: []string{
|
| 40 | 40 |
"aaa", |
| 41 | 41 |
}, |
| 42 | 42 |
}) |
| 43 | 43 |
assert.NilError(t, err) |
| 44 | 44 |
|
| 45 |
- err = client.ContainerStart(ctx, "ng1", types.ContainerStartOptions{})
|
|
| 45 |
+ err = client.ContainerStart(ctx, cID1, types.ContainerStartOptions{})
|
|
| 46 | 46 |
assert.NilError(t, err) |
| 47 | 47 |
|
| 48 |
- ng1, err := client.ContainerInspect(ctx, "ng1") |
|
| 48 |
+ ng1, err := client.ContainerInspect(ctx, cID1) |
|
| 49 | 49 |
assert.NilError(t, err) |
| 50 | 50 |
assert.Check(t, is.Equal(len(ng1.NetworkSettings.Networks[name].Aliases), 2)) |
| 51 | 51 |
assert.Check(t, is.Equal(ng1.NetworkSettings.Networks[name].Aliases[0], "aaa")) |
| 52 | 52 |
|
| 53 |
- container.Create(t, ctx, client, container.WithName("ng2"), func(c *container.TestContainerConfig) {
|
|
| 53 |
+ cID2 := container.Create(t, ctx, client, func(c *container.TestContainerConfig) {
|
|
| 54 | 54 |
c.NetworkingConfig = &network.NetworkingConfig{
|
| 55 | 55 |
map[string]*network.EndpointSettings{
|
| 56 | 56 |
name: {},
|
| ... | ... |
@@ -58,17 +58,17 @@ func TestDockerNetworkConnectAlias(t *testing.T) {
|
| 58 | 58 |
} |
| 59 | 59 |
}) |
| 60 | 60 |
|
| 61 |
- err = client.NetworkConnect(ctx, name, "ng2", &network.EndpointSettings{
|
|
| 61 |
+ err = client.NetworkConnect(ctx, name, cID2, &network.EndpointSettings{
|
|
| 62 | 62 |
Aliases: []string{
|
| 63 | 63 |
"bbb", |
| 64 | 64 |
}, |
| 65 | 65 |
}) |
| 66 | 66 |
assert.NilError(t, err) |
| 67 | 67 |
|
| 68 |
- err = client.ContainerStart(ctx, "ng2", types.ContainerStartOptions{})
|
|
| 68 |
+ err = client.ContainerStart(ctx, cID2, types.ContainerStartOptions{})
|
|
| 69 | 69 |
assert.NilError(t, err) |
| 70 | 70 |
|
| 71 |
- ng2, err := client.ContainerInspect(ctx, "ng2") |
|
| 71 |
+ ng2, err := client.ContainerInspect(ctx, cID2) |
|
| 72 | 72 |
assert.NilError(t, err) |
| 73 | 73 |
assert.Check(t, is.Equal(len(ng2.NetworkSettings.Networks[name].Aliases), 2)) |
| 74 | 74 |
assert.Check(t, is.Equal(ng2.NetworkSettings.Networks[name].Aliases[0], "bbb")) |