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 <cpuguy83@gmail.com>
Upstream-commit: 9e3193810da91d81f6b2dba3171443557f756794
Component: engine
This commit is contained in:
Brian Goff
2018-01-11 11:47:21 -05:00
parent a64e387daf
commit 8bf6743e94
@@ -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...)