1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

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>
This commit is contained in:
Brian Goff 2018-01-11 11:35:38 -05:00
parent cc79c6c7da
commit 9e3193810d

View file

@ -59,9 +59,9 @@ func TestDaemonRestartKillContainers(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
var args []string args := []string{"--iptables=false"}
if liveRestoreEnabled { if liveRestoreEnabled {
args = []string{"--live-restore"} args = append(args, "--live-restore")
} }
d.StartWithBusybox(t, args...) d.StartWithBusybox(t, args...)