From b4d1547af6b91baa2ffcb8a391c35d9bc5cdc48f Mon Sep 17 00:00:00 2001 From: Arash Deshmeh Date: Tue, 20 Mar 2018 17:09:18 -0400 Subject: [PATCH] container/nat integration tests use unique names for test containers Signed-off-by: Arash Deshmeh --- integration/container/nat_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/integration/container/nat_test.go b/integration/container/nat_test.go index f4a3ea6f3a..5e7402770b 100644 --- a/integration/container/nat_test.go +++ b/integration/container/nat_test.go @@ -62,14 +62,14 @@ func TestNetworkLoopbackNat(t *testing.T) { defer setupTest(t)() msg := "it works" - startServerContainer(t, msg, 8080) + serverContainerID := startServerContainer(t, msg, 8080) endpoint := getExternalAddress(t) client := request.NewAPIClient(t) ctx := context.Background() - cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:server")) + cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:"+serverContainerID)) poll.WaitOn(t, container.IsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond)) @@ -90,7 +90,7 @@ func startServerContainer(t *testing.T, msg string, port int) string { client := request.NewAPIClient(t) ctx := context.Background() - cID := container.Run(t, ctx, client, container.WithName("server"), container.WithCmd("sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port)), container.WithExposedPorts(fmt.Sprintf("%d/tcp", port)), func(c *container.TestContainerConfig) { + cID := container.Run(t, ctx, client, container.WithName("server-"+t.Name()), container.WithCmd("sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port)), container.WithExposedPorts(fmt.Sprintf("%d/tcp", port)), func(c *container.TestContainerConfig) { c.HostConfig.PortBindings = nat.PortMap{ nat.Port(fmt.Sprintf("%d/tcp", port)): []nat.PortBinding{ {