Browse code
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 <github@gone.nl>
Sebastiaan van Stijn authored on 2021/12/16 20:48:39Showing 1 changed files
| ... | ... |
@@ -601,7 +601,7 @@ func (s *DockerDaemonSuite) TestDaemonBridgeExternal(c *testing.T) {
|
| 601 | 601 |
// which may happen if it was created with the same IP range. |
| 602 | 602 |
deleteInterface(c, "docker0") |
| 603 | 603 |
|
| 604 |
- bridgeName := "external-bridge" |
|
| 604 |
+ bridgeName := "ext-bridge1" |
|
| 605 | 605 |
bridgeIP := "192.169.1.1/24" |
| 606 | 606 |
_, bridgeIPNet, _ := net.ParseCIDR(bridgeIP) |
| 607 | 607 |
|
| ... | ... |
@@ -720,7 +720,7 @@ func (s *DockerDaemonSuite) TestDaemonBridgeFixedCidr(c *testing.T) {
|
| 720 | 720 |
// which may happen if it was created with the same IP range. |
| 721 | 721 |
deleteInterface(c, "docker0") |
| 722 | 722 |
|
| 723 |
- bridgeName := "external-bridge" |
|
| 723 |
+ bridgeName := "ext-bridge2" |
|
| 724 | 724 |
bridgeIP := "192.169.1.1/24" |
| 725 | 725 |
|
| 726 | 726 |
createInterface(c, "bridge", bridgeName, bridgeIP) |
| ... | ... |
@@ -746,7 +746,7 @@ func (s *DockerDaemonSuite) TestDaemonBridgeFixedCidr2(c *testing.T) {
|
| 746 | 746 |
// which may happen if it was created with the same IP range. |
| 747 | 747 |
deleteInterface(c, "docker0") |
| 748 | 748 |
|
| 749 |
- bridgeName := "external-bridge" |
|
| 749 |
+ bridgeName := "ext-bridge3" |
|
| 750 | 750 |
bridgeIP := "10.2.2.1/16" |
| 751 | 751 |
|
| 752 | 752 |
createInterface(c, "bridge", bridgeName, bridgeIP) |
| ... | ... |
@@ -775,7 +775,7 @@ func (s *DockerDaemonSuite) TestDaemonBridgeFixedCIDREqualBridgeNetwork(c *testi |
| 775 | 775 |
// which may happen if it was created with the same IP range. |
| 776 | 776 |
deleteInterface(c, "docker0") |
| 777 | 777 |
|
| 778 |
- bridgeName := "external-bridge" |
|
| 778 |
+ bridgeName := "ext-bridge4" |
|
| 779 | 779 |
bridgeIP := "172.27.42.1/16" |
| 780 | 780 |
|
| 781 | 781 |
createInterface(c, "bridge", bridgeName, bridgeIP) |
| ... | ... |
@@ -879,7 +879,7 @@ func (s *DockerDaemonSuite) TestDaemonICCPing(c *testing.T) {
|
| 879 | 879 |
// which may happen if it was created with the same IP range. |
| 880 | 880 |
deleteInterface(c, "docker0") |
| 881 | 881 |
|
| 882 |
- bridgeName := "external-bridge" |
|
| 882 |
+ bridgeName := "ext-bridge5" |
|
| 883 | 883 |
bridgeIP := "192.169.1.1/24" |
| 884 | 884 |
|
| 885 | 885 |
createInterface(c, "bridge", bridgeName, bridgeIP) |
| ... | ... |
@@ -917,7 +917,7 @@ func (s *DockerDaemonSuite) TestDaemonICCLinkExpose(c *testing.T) {
|
| 917 | 917 |
// which may happen if it was created with the same IP range. |
| 918 | 918 |
deleteInterface(c, "docker0") |
| 919 | 919 |
|
| 920 |
- bridgeName := "external-bridge" |
|
| 920 |
+ bridgeName := "ext-bridge6" |
|
| 921 | 921 |
bridgeIP := "192.169.1.1/24" |
| 922 | 922 |
|
| 923 | 923 |
createInterface(c, "bridge", bridgeName, bridgeIP) |
| ... | ... |
@@ -943,7 +943,7 @@ func (s *DockerDaemonSuite) TestDaemonLinksIpTablesRulesWhenLinkAndUnlink(c *tes |
| 943 | 943 |
// which may happen if it was created with the same IP range. |
| 944 | 944 |
deleteInterface(c, "docker0") |
| 945 | 945 |
|
| 946 |
- bridgeName := "external-bridge" |
|
| 946 |
+ bridgeName := "ext-bridge7" |
|
| 947 | 947 |
bridgeIP := "192.169.1.1/24" |
| 948 | 948 |
|
| 949 | 949 |
createInterface(c, "bridge", bridgeName, bridgeIP) |