Merge pull request #50196 from robmry/fix_TestDaemonRestartRestoreBridgeNetwork

robmry · web-flow · commit f9e6f25677a1 · 2025-06-13T12:21:19.000+01:00
Fix flaky test TestDaemonRestartRestoreBridgeNetwork
diff --git a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go
@@ -1691,8 +1691,8 @@ func (s *DockerDaemonSuite) TestDaemonRestartRestoreBridgeNetwork(t *testing.T)
 
 	// start a new container, trying to publish port 80:80 should fail
 	out, err := s.d.Cmd("run", "-p", "80:80", "-d", "busybox", "top")
-	if err == nil || !strings.Contains(out, "Bind for 0.0.0.0:80 failed: port is already allocated") {
-		t.Fatalf("80 port is allocated to old running container, it should failed on allocating to new container")
+	if err == nil || !strings.Contains(out, "port is already allocated") {
+		t.Fatalf("Expected 'port is already allocated', got err:%v out:%s", err, out)
 	}
 
 	// kill old running container and try to allocate again

Original file line number	Diff line number	Diff line change
`@@ -1691,8 +1691,8 @@ func (s DockerDaemonSuite) TestDaemonRestartRestoreBridgeNetwork(t testing.T)`
`1691`	`1691`
`1692`	`1692`	`// start a new container, trying to publish port 80:80 should fail`
`1693`	`1693`	`out, err := s.d.Cmd("run", "-p", "80:80", "-d", "busybox", "top")`
`1694`		`- if err == nil \|\| !strings.Contains(out, "Bind for 0.0.0.0:80 failed: port is already allocated") {`
`1695`		`- t.Fatalf("80 port is allocated to old running container, it should failed on allocating to new container")`
	`1694`	`+ if err == nil \|\| !strings.Contains(out, "port is already allocated") {`
	`1695`	`+ t.Fatalf("Expected 'port is already allocated', got err:%v out:%s", err, out)`
`1696`	`1696`	`}`
`1697`	`1697`
`1698`	`1698`	`// kill old running container and try to allocate again`