From d2c6602cac9908072935e43b8e19d9105e3d209c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 16 Dec 2021 12:48:39 +0100 Subject: [PATCH] integration-cli: use unique names for custom bridges Use unique names to prevent tests from interfering, using a shorter name, as there's a maximum length for these. Signed-off-by: Sebastiaan van Stijn --- integration-cli/docker_cli_daemon_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index 297c62fe77..5b57c0b8a1 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -601,7 +601,7 @@ func (s *DockerDaemonSuite) TestDaemonBridgeExternal(c *testing.T) { // which may happen if it was created with the same IP range. deleteInterface(c, "docker0") - bridgeName := "external-bridge" + bridgeName := "ext-bridge1" bridgeIP := "192.169.1.1/24" _, bridgeIPNet, _ := net.ParseCIDR(bridgeIP) @@ -720,7 +720,7 @@ func (s *DockerDaemonSuite) TestDaemonBridgeFixedCidr(c *testing.T) { // which may happen if it was created with the same IP range. deleteInterface(c, "docker0") - bridgeName := "external-bridge" + bridgeName := "ext-bridge2" bridgeIP := "192.169.1.1/24" createInterface(c, "bridge", bridgeName, bridgeIP) @@ -746,7 +746,7 @@ func (s *DockerDaemonSuite) TestDaemonBridgeFixedCidr2(c *testing.T) { // which may happen if it was created with the same IP range. deleteInterface(c, "docker0") - bridgeName := "external-bridge" + bridgeName := "ext-bridge3" bridgeIP := "10.2.2.1/16" createInterface(c, "bridge", bridgeName, bridgeIP) @@ -775,7 +775,7 @@ func (s *DockerDaemonSuite) TestDaemonBridgeFixedCIDREqualBridgeNetwork(c *testi // which may happen if it was created with the same IP range. deleteInterface(c, "docker0") - bridgeName := "external-bridge" + bridgeName := "ext-bridge4" bridgeIP := "172.27.42.1/16" createInterface(c, "bridge", bridgeName, bridgeIP) @@ -879,7 +879,7 @@ func (s *DockerDaemonSuite) TestDaemonICCPing(c *testing.T) { // which may happen if it was created with the same IP range. deleteInterface(c, "docker0") - bridgeName := "external-bridge" + bridgeName := "ext-bridge5" bridgeIP := "192.169.1.1/24" createInterface(c, "bridge", bridgeName, bridgeIP) @@ -917,7 +917,7 @@ func (s *DockerDaemonSuite) TestDaemonICCLinkExpose(c *testing.T) { // which may happen if it was created with the same IP range. deleteInterface(c, "docker0") - bridgeName := "external-bridge" + bridgeName := "ext-bridge6" bridgeIP := "192.169.1.1/24" createInterface(c, "bridge", bridgeName, bridgeIP) @@ -943,7 +943,7 @@ func (s *DockerDaemonSuite) TestDaemonLinksIpTablesRulesWhenLinkAndUnlink(c *tes // which may happen if it was created with the same IP range. deleteInterface(c, "docker0") - bridgeName := "external-bridge" + bridgeName := "ext-bridge7" bridgeIP := "192.169.1.1/24" createInterface(c, "bridge", bridgeName, bridgeIP)