Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 8a9f4fb

Browse filesBrowse files
robmryrobmry
committed
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>
1 parent b28cfd3 commit 8a9f4fb
Copy full SHA for 8a9f4fb

3 files changed

+6-10Lines changed: 6 additions & 10 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎integration/networking/bridge_test.go‎

Copy file name to clipboardExpand all lines: integration/networking/bridge_test.go
+4-6Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestBridgeICC(t *testing.T) {
3030
ctx := setupTest(t)
3131

3232
d := daemon.New(t)
33-
d.StartWithBusybox(ctx, t, "-D", "--experimental", "--ip6tables")
33+
d.StartWithBusybox(ctx, t)
3434
defer d.Stop(t)
3535

3636
c := d.NewClientT(t)
@@ -276,7 +276,7 @@ func TestBridgeINC(t *testing.T) {
276276
ctx := setupTest(t)
277277

278278
d := daemon.New(t)
279-
d.StartWithBusybox(ctx, t, "-D", "--experimental", "--ip6tables")
279+
d.StartWithBusybox(ctx, t)
280280
defer d.Stop(t)
281281

282282
c := d.NewClientT(t)
@@ -426,8 +426,6 @@ func TestDefaultBridgeIPv6(t *testing.T) {
426426

427427
d := daemon.New(t)
428428
d.StartWithBusybox(ctx, t,
429-
"--experimental",
430-
"--ip6tables",
431429
"--ipv6",
432430
"--fixed-cidr-v6", tc.fixed_cidr_v6,
433431
)
@@ -547,7 +545,7 @@ func TestDefaultBridgeAddresses(t *testing.T) {
547545
ctx := testutil.StartSpan(ctx, t)
548546
// Check that the daemon starts - regression test for:
549547
// https://github.com/moby/moby/issues/46829
550-
d.StartWithBusybox(ctx, t, "--experimental", "--ipv6", "--ip6tables", "--fixed-cidr-v6="+step.fixedCIDRV6)
548+
d.StartWithBusybox(ctx, t, "--ipv6", "--fixed-cidr-v6="+step.fixedCIDRV6)
551549

552550
// Start a container, so that the bridge is set "up" and gets a kernel_ll address.
553551
cID := container.Run(ctx, t, c)
@@ -581,7 +579,7 @@ func TestInternalNwConnectivity(t *testing.T) {
581579
ctx := setupTest(t)
582580

583581
d := daemon.New(t)
584-
d.StartWithBusybox(ctx, t, "-D", "--experimental", "--ip6tables")
582+
d.StartWithBusybox(ctx, t)
585583
defer d.Stop(t)
586584

587585
c := d.NewClientT(t)
Collapse file

‎integration/networking/etchosts_test.go‎

Copy file name to clipboardExpand all lines: integration/networking/etchosts_test.go
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ func TestEtcHostsIpv6(t *testing.T) {
2424
d := daemon.New(t)
2525
d.StartWithBusybox(ctx, t,
2626
"--ipv6",
27-
"--ip6tables",
28-
"--experimental",
2927
"--fixed-cidr-v6=fdc8:ffe2:d8d7:1234::/64")
3028
defer d.Stop(t)
3129

Collapse file

‎integration/networking/resolvconf_test.go‎

Copy file name to clipboardExpand all lines: integration/networking/resolvconf_test.go
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestResolvConfLocalhostIPv6(t *testing.T) {
2525
tmpFileName := network.WriteTempResolvConf(t, "127.0.0.53")
2626

2727
d := daemon.New(t, daemon.WithEnvVars("DOCKER_TEST_RESOLV_CONF_PATH="+tmpFileName))
28-
d.StartWithBusybox(ctx, t, "--experimental", "--ip6tables")
28+
d.StartWithBusybox(ctx, t)
2929
defer d.Stop(t)
3030

3131
c := d.NewClientT(t)
@@ -78,7 +78,7 @@ func TestInternalNetworkDNS(t *testing.T) {
7878
// Set up a temp resolv.conf pointing at that DNS server, and a daemon using it.
7979
tmpFileName := network.WriteTempResolvConf(t, "127.0.0.1")
8080
d := daemon.New(t, daemon.WithEnvVars("DOCKER_TEST_RESOLV_CONF_PATH="+tmpFileName))
81-
d.StartWithBusybox(ctx, t, "--experimental", "--ip6tables")
81+
d.StartWithBusybox(ctx, t)
8282
defer d.Stop(t)
8383

8484
c := d.NewClientT(t)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.