Bläddra i källkod

Merge pull request #956 from docker/fix-port-collision

Avoid port collision with compose up test
Nicolas De loof 5 år sedan
förälder
incheckning
9e1de51f82
1 ändrade filer med 4 tillägg och 2 borttagningar
  1. 4 2
      local/e2e/backend_test.go

+ 4 - 2
local/e2e/backend_test.go

@@ -23,6 +23,8 @@ import (
 	"testing"
 	"testing"
 	"time"
 	"time"
 
 
+	"gotest.tools/v3/assert"
+	"gotest.tools/v3/assert/cmp"
 	"gotest.tools/v3/icmd"
 	"gotest.tools/v3/icmd"
 	"gotest.tools/v3/poll"
 	"gotest.tools/v3/poll"
 
 
@@ -78,7 +80,7 @@ func TestLocalBackendRun(t *testing.T) {
 	})
 	})
 
 
 	t.Run("run with ports", func(t *testing.T) {
 	t.Run("run with ports", func(t *testing.T) {
-		res := c.RunDockerCmd("run", "-d", "-p", "8080:80", "nginx")
+		res := c.RunDockerCmd("run", "-d", "-p", "80", "nginx")
 		containerName := strings.TrimSpace(res.Combined())
 		containerName := strings.TrimSpace(res.Combined())
 		t.Cleanup(func() {
 		t.Cleanup(func() {
 			_ = c.RunDockerOrExitError("rm", "-f", containerName)
 			_ = c.RunDockerOrExitError("rm", "-f", containerName)
@@ -86,7 +88,7 @@ func TestLocalBackendRun(t *testing.T) {
 		res = c.RunDockerCmd("inspect", containerName)
 		res = c.RunDockerCmd("inspect", containerName)
 		res.Assert(t, icmd.Expected{Out: `"Status": "running"`})
 		res.Assert(t, icmd.Expected{Out: `"Status": "running"`})
 		res = c.RunDockerCmd("ps")
 		res = c.RunDockerCmd("ps")
-		res.Assert(t, icmd.Expected{Out: "0.0.0.0:8080->80/tcp"})
+		assert.Assert(t, cmp.Regexp(`0\.0\.0\.0:\d*->80/tcp`, res.Stdout()))
 	})
 	})
 
 
 	t.Run("run with volume", func(t *testing.T) {
 	t.Run("run with volume", func(t *testing.T) {