From 8bf6743e942f4300f81c60bad8dce8256431f141 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Thu, 11 Jan 2018 11:35:38 -0500 Subject: [PATCH] Fix race with concurrent daemon startup in tests Using parallel tests is nice, however it can cause an issue with multiple daemons trying to make changes to iptables at the same time which causes flakey tests. This just disables iptables for the set of tests since it is not required. Signed-off-by: Brian Goff Upstream-commit: 9e3193810da91d81f6b2dba3171443557f756794 Component: engine --- components/engine/integration/container/restart_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/integration/container/restart_test.go b/components/engine/integration/container/restart_test.go index fe80f09157..cf014b5916 100644 --- a/components/engine/integration/container/restart_test.go +++ b/components/engine/integration/container/restart_test.go @@ -59,9 +59,9 @@ func TestDaemonRestartKillContainers(t *testing.T) { t.Fatal(err) } - var args []string + args := []string{"--iptables=false"} if liveRestoreEnabled { - args = []string{"--live-restore"} + args = append(args, "--live-restore") } d.StartWithBusybox(t, args...)