From 7b9ae696d86066f6245e2c17e7afd5ce8e868fe5 Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Fri, 5 Jun 2015 14:50:11 -0700 Subject: [PATCH] Add integ test for unpublished ports in ps o/p - This is a test to assert the fix #13734 Signed-off-by: Alessandro Boch --- integration-cli/docker_cli_port_test.go | 95 +++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/integration-cli/docker_cli_port_test.go b/integration-cli/docker_cli_port_test.go index f0cb663964..db2fbb7c5c 100644 --- a/integration-cli/docker_cli_port_test.go +++ b/integration-cli/docker_cli_port_test.go @@ -1,8 +1,10 @@ package main import ( + "fmt" "net" "os/exec" + "regexp" "sort" "strings" @@ -221,3 +223,96 @@ func (s *DockerSuite) TestPortExposeHostBinding(c *check.C) { c.Error("Port is still bound after the Container is removed") } } + +func stopRemoveContainer(id string, c *check.C) { + runCmd := exec.Command(dockerBinary, "rm", "-f", id) + _, _, err := runCommandWithOutput(runCmd) + c.Assert(err, check.IsNil) +} + +func (s *DockerSuite) TestUnpublishedPortsInPsOutput(c *check.C) { + // Run busybox with command line expose (equivalent to EXPOSE in image's Dockerfile) for the following ports + port1 := 80 + port2 := 443 + expose1 := fmt.Sprintf("--expose=%d", port1) + expose2 := fmt.Sprintf("--expose=%d", port2) + runCmd := exec.Command(dockerBinary, "run", "-d", expose1, expose2, "busybox", "sleep", "5") + out, _, err := runCommandWithOutput(runCmd) + c.Assert(err, check.IsNil) + + // Check docker ps o/p for last created container reports the unpublished ports + unpPort1 := fmt.Sprintf("%d/tcp", port1) + unpPort2 := fmt.Sprintf("%d/tcp", port2) + runCmd = exec.Command(dockerBinary, "ps", "-n=1") + out, _, err = runCommandWithOutput(runCmd) + c.Assert(err, check.IsNil) + if !strings.Contains(out, unpPort1) || !strings.Contains(out, unpPort2) { + c.Errorf("Missing unpublished ports(s) (%s, %s) in docker ps output: %s", unpPort1, unpPort2, out) + } + + // Run the container forcing to publish the exposed ports + runCmd = exec.Command(dockerBinary, "run", "-d", "-P", expose1, expose2, "busybox", "sleep", "5") + out, _, err = runCommandWithOutput(runCmd) + c.Assert(err, check.IsNil) + + // Check docker ps o/p for last created container reports the exposed ports in the port bindings + expBndRegx1 := regexp.MustCompile(`0.0.0.0:\d\d\d\d\d->` + unpPort1) + expBndRegx2 := regexp.MustCompile(`0.0.0.0:\d\d\d\d\d->` + unpPort2) + runCmd = exec.Command(dockerBinary, "ps", "-n=1") + out, _, err = runCommandWithOutput(runCmd) + c.Assert(err, check.IsNil) + if !expBndRegx1.MatchString(out) || !expBndRegx2.MatchString(out) { + c.Errorf("Cannot find expected port binding ports(s) (0.0.0.0:xxxxx->%s, 0.0.0.0:xxxxx->%s) in docker ps output:\n%s", + unpPort1, unpPort2, out) + } + + // Run the container specifying explicit port bindings for the exposed ports + offset := 10000 + pFlag1 := fmt.Sprintf("%d:%d", offset+port1, port1) + pFlag2 := fmt.Sprintf("%d:%d", offset+port2, port2) + runCmd = exec.Command(dockerBinary, "run", "-d", "-p", pFlag1, "-p", pFlag2, expose1, expose2, "busybox", "sleep", "5") + out, _, err = runCommandWithOutput(runCmd) + c.Assert(err, check.IsNil) + id := strings.TrimSpace(out) + + // Check docker ps o/p for last created container reports the specified port mappings + expBnd1 := fmt.Sprintf("0.0.0.0:%d->%s", offset+port1, unpPort1) + expBnd2 := fmt.Sprintf("0.0.0.0:%d->%s", offset+port2, unpPort2) + runCmd = exec.Command(dockerBinary, "ps", "-n=1") + out, _, err = runCommandWithOutput(runCmd) + c.Assert(err, check.IsNil) + if !strings.Contains(out, expBnd1) || !strings.Contains(out, expBnd2) { + c.Errorf("Cannot find expected port binding(s) (%s, %s) in docker ps output: %s", expBnd1, expBnd2, out) + } + // Remove container now otherwise it will interfeer with next test + stopRemoveContainer(id, c) + + // Run the container with explicit port bindings and no exposed ports + runCmd = exec.Command(dockerBinary, "run", "-d", "-p", pFlag1, "-p", pFlag2, "busybox", "sleep", "5") + out, _, err = runCommandWithOutput(runCmd) + c.Assert(err, check.IsNil) + id = strings.TrimSpace(out) + + // Check docker ps o/p for last created container reports the specified port mappings + runCmd = exec.Command(dockerBinary, "ps", "-n=1") + out, _, err = runCommandWithOutput(runCmd) + c.Assert(err, check.IsNil) + if !strings.Contains(out, expBnd1) || !strings.Contains(out, expBnd2) { + c.Errorf("Cannot find expected port binding(s) (%s, %s) in docker ps output: %s", expBnd1, expBnd2, out) + } + // Remove container now otherwise it will interfeer with next test + stopRemoveContainer(id, c) + + // Run the container with one unpublished exposed port and one explicit port binding + runCmd = exec.Command(dockerBinary, "run", "-d", expose1, "-p", pFlag2, "busybox", "sleep", "5") + out, _, err = runCommandWithOutput(runCmd) + c.Assert(err, check.IsNil) + + // Check docker ps o/p for last created container reports the specified unpublished port and port mapping + runCmd = exec.Command(dockerBinary, "ps", "-n=1") + out, _, err = runCommandWithOutput(runCmd) + c.Assert(err, check.IsNil) + if !strings.Contains(out, unpPort1) || !strings.Contains(out, expBnd2) { + c.Errorf("Missing unpublished ports or port binding (%s, %s) in docker ps output: %s", unpPort1, expBnd2, out) + } +}