From 6623004cd45ae6fe2cbb3743e4176dc8e1ff683d Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Mon, 12 Mar 2018 14:48:49 -0700 Subject: [PATCH] integration/TestContainerShmNoLeak: use --iptables=false As mentioned in commit 9e31938, test cases that use t.Parallel() and start a docker daemon might step on each other toes as they try to configure iptables during startup, resulting in flaky tests. To avoid this, --iptables=false should be used while starting daemon. Fixes: eaa5192856c1 ("Make container resource mounts unbindable") Signed-off-by: Kir Kolyshkin Upstream-commit: c125e10a0486623ba3badebf974ea6e582373151 Component: engine --- components/engine/integration/container/mounts_linux_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/integration/container/mounts_linux_test.go b/components/engine/integration/container/mounts_linux_test.go index 71bdccc71b..c36dd2761c 100644 --- a/components/engine/integration/container/mounts_linux_test.go +++ b/components/engine/integration/container/mounts_linux_test.go @@ -30,7 +30,7 @@ func TestContainerShmNoLeak(t *testing.T) { if err != nil { t.Fatal(err) } - d.StartWithBusybox(t) + d.StartWithBusybox(t, "--iptables=false") defer d.Stop(t) ctx := context.Background()