Don't explicitly enable ip6tables in tests

Tests no longer need to use "--experimental --ip6tables", now ip6tables is the default behaviour. Signed-off-by: Rob Murray <rob.murray@docker.com>
moby · Apr 30, 2024 · fe1dd01 · fe1dd01
1 parent f4c0688
commit fe1dd01
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/integration/networking/bridge_test.go b/integration/networking/bridge_test.go
@@ -30,7 +30,7 @@ func TestBridgeICC(t *testing.T) {
 	ctx := setupTest(t)
 
 	d := daemon.New(t)
-	d.StartWithBusybox(ctx, t, "-D", "--experimental", "--ip6tables")
+	d.StartWithBusybox(ctx, t)
 	defer d.Stop(t)
 
 	c := d.NewClientT(t)
@@ -276,7 +276,7 @@ func TestBridgeINC(t *testing.T) {
 	ctx := setupTest(t)
 
 	d := daemon.New(t)
-	d.StartWithBusybox(ctx, t, "-D", "--experimental", "--ip6tables")
+	d.StartWithBusybox(ctx, t)
 	defer d.Stop(t)
 
 	c := d.NewClientT(t)
@@ -426,8 +426,6 @@ func TestDefaultBridgeIPv6(t *testing.T) {
 
 			d := daemon.New(t)
 			d.StartWithBusybox(ctx, t,
-				"--experimental",
-				"--ip6tables",
 				"--ipv6",
 				"--fixed-cidr-v6", tc.fixed_cidr_v6,
 			)
@@ -538,7 +536,7 @@ func TestDefaultBridgeAddresses(t *testing.T) {
 			for _, step := range tc.steps {
 				// Check that the daemon starts - regression test for:
 				//   https://github.com/moby/moby/issues/46829
-				d.Start(t, "--experimental", "--ipv6", "--ip6tables", "--fixed-cidr-v6="+step.fixedCIDRV6)
+				d.Start(t, "--ipv6", "--fixed-cidr-v6="+step.fixedCIDRV6)
 				d.Stop(t)
 
 				// Check that the expected addresses have been applied to the bridge. (Skip in
@@ -566,7 +564,7 @@ func TestInternalNwConnectivity(t *testing.T) {
 	ctx := setupTest(t)
 
 	d := daemon.New(t)
-	d.StartWithBusybox(ctx, t, "-D", "--experimental", "--ip6tables")
+	d.StartWithBusybox(ctx, t)
 	defer d.Stop(t)
 
 	c := d.NewClientT(t)

diff --git a/integration/networking/etchosts_test.go b/integration/networking/etchosts_test.go
@@ -24,8 +24,6 @@ func TestEtcHostsIpv6(t *testing.T) {
 	d := daemon.New(t)
 	d.StartWithBusybox(ctx, t,
 		"--ipv6",
-		"--ip6tables",
-		"--experimental",
 		"--fixed-cidr-v6=fdc8:ffe2:d8d7:1234::/64")
 	defer d.Stop(t)
 

diff --git a/integration/networking/resolvconf_test.go b/integration/networking/resolvconf_test.go
@@ -25,7 +25,7 @@ func TestResolvConfLocalhostIPv6(t *testing.T) {
 	tmpFileName := network.WriteTempResolvConf(t, "127.0.0.53")
 
 	d := daemon.New(t, daemon.WithEnvVars("DOCKER_TEST_RESOLV_CONF_PATH="+tmpFileName))
-	d.StartWithBusybox(ctx, t, "--experimental", "--ip6tables")
+	d.StartWithBusybox(ctx, t)
 	defer d.Stop(t)
 
 	c := d.NewClientT(t)
@@ -78,7 +78,7 @@ func TestInternalNetworkDNS(t *testing.T) {
 	// Set up a temp resolv.conf pointing at that DNS server, and a daemon using it.
 	tmpFileName := network.WriteTempResolvConf(t, "127.0.0.1")
 	d := daemon.New(t, daemon.WithEnvVars("DOCKER_TEST_RESOLV_CONF_PATH="+tmpFileName))
-	d.StartWithBusybox(ctx, t, "--experimental", "--ip6tables")
+	d.StartWithBusybox(ctx, t)
 	defer d.Stop(t)
 
 	c := d.NewClientT(t)