Merge pull request #35982 from cpuguy83/fix_concurrent_daemon_test_issues

Fix race with concurrent daemon startup in tests
2018-01-11 14:26:35 -05:00 · 2018-01-11 14:26:35 -05:00 · 92309e34e4
parent cc79c6c7da 9e3193810d
commit 92309e34e4
1 changed files with 2 additions and 2 deletions
--- 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...)