Fix race with concurrent daemon startup in tests

cpuguy83 · cpuguy83 · commit 9e3193810da9 · 2018-01-11T11:47:21.000-05:00
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 &lt;cpuguy83@gmail.com&gt;
diff --git a/integration/container/restart_test.go b/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...)

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,9 @@ func TestDaemonRestartKillContainers(t *testing.T) {`
`59`	`59`	`t.Fatal(err)`
`60`	`60`	`}`
`61`	`61`
`62`		`- var args []string`
	`62`	`+ args := []string{"--iptables=false"}`
`63`	`63`	`if liveRestoreEnabled {`
`64`		`- args = []string{"--live-restore"}`
	`64`	`+ args = append(args, "--live-restore")`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`d.StartWithBusybox(t, args...)`